From ba2eee5aa65bcd419f00d689ffb8fceea7542c4f Mon Sep 17 00:00:00 2001 From: Sandip Patel Date: Fri, 6 Dec 2019 15:01:46 +0530 Subject: [PATCH] unsigned_int unpacking --- libraries/chain/include/graphene/chain/protocol/types.hpp | 1 - libraries/db/include/graphene/db/object_id.hpp | 1 - libraries/fc | 2 +- programs/js_operation_serializer/main.cpp | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/chain/include/graphene/chain/protocol/types.hpp b/libraries/chain/include/graphene/chain/protocol/types.hpp index 8ea3a8af..3c14611f 100644 --- a/libraries/chain/include/graphene/chain/protocol/types.hpp +++ b/libraries/chain/include/graphene/chain/protocol/types.hpp @@ -95,7 +95,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 255ef048..6c2d597f 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/libraries/fc b/libraries/fc index bca39221..6cc95348 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit bca392213c5104773be9ffa0fbde8958835a5da2 +Subproject commit 6cc9534891db71b5a0692e61a29a7b1d520a238e diff --git a/programs/js_operation_serializer/main.cpp b/programs/js_operation_serializer/main.cpp index 8994b36b..666fddab 100644 --- a/programs/js_operation_serializer/main.cpp +++ b/programs/js_operation_serializer/main.cpp @@ -128,8 +128,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 "varint32"; } }; +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"; } };