From 53558f334bbbbc47de71947639bbb0729fd636df Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Sun, 19 Aug 2018 15:43:59 +0200 Subject: [PATCH 1/3] Removed broken signed_int --- libraries/chain/include/graphene/chain/protocol/types.hpp | 1 - libraries/db/include/graphene/db/object_id.hpp | 1 - programs/js_operation_serializer/main.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index 526fd995d5..bd04c071d3 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -74,7 +74,6 @@ namespace graphene { namespace chain { using fc::enum_type; using fc::optional; using fc::unsigned_int; - using fc::signed_int; using fc::time_point_sec; using fc::time_point; using fc::safe; diff --git a/libraries/db/include/graphene/db/object_id.hpp b/libraries/db/include/graphene/db/object_id.hpp index a383a11c8e..acada38d14 100644 --- a/libraries/db/include/graphene/db/object_id.hpp +++ b/libraries/db/include/graphene/db/object_id.hpp @@ -34,7 +34,6 @@ namespace graphene { namespace db { using fc::flat_map; using fc::variant; using fc::unsigned_int; - using fc::signed_int; struct object_id_type { diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 47dc48153c..64eefb8e0b 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -122,7 +122,6 @@ template<> struct js_name { static std::string name(){ retu template<> struct js_name { static std::string name(){ return "bytes 28"; } }; template<> struct js_name { static std::string name(){ return "bytes 32"; } }; template<> struct js_name { static std::string name(){ return "varuint32"; } }; -template<> struct js_name { static std::string name(){ return "varint32"; } }; template<> struct js_name< vote_id_type > { static std::string name(){ return "vote_id"; } }; template<> struct js_name< time_point_sec > { static std::string name(){ return "time_point_sec"; } }; From f950c7758eacde7a3af5f89433b2dd08483a4805 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Mon, 20 Aug 2018 15:17:19 +0200 Subject: [PATCH 2/3] unsigned_int is now varuint64 --- programs/js_operation_serializer/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 64eefb8e0b..e955f8d7fa 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -121,7 +121,7 @@ template<> struct js_name< std::vector > { static std::string name(){ retu template<> struct js_name { static std::string name(){ return "bytes 20"; } }; template<> struct js_name { static std::string name(){ return "bytes 28"; } }; template<> struct js_name { static std::string name(){ return "bytes 32"; } }; -template<> struct js_name { static std::string name(){ return "varuint32"; } }; +template<> struct js_name { static std::string name(){ return "varuint64"; } }; template<> struct js_name< vote_id_type > { static std::string name(){ return "vote_id"; } }; template<> struct js_name< time_point_sec > { static std::string name(){ return "time_point_sec"; } }; From 0395ed1863d5ba72f8b1b81a0bb4d563dac574a2 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Wed, 22 Aug 2018 17:15:54 +0200 Subject: [PATCH 3/3] Bump fc --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 7ac533b0c3..2405081a18 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 7ac533b0c346fe40b03023bc628aee0b6c257a66 +Subproject commit 2405081a18a3fa23e06e1e751cd020de835b182e