From a25fa06e438d21c049cc9f20167b418ae4bcfe50 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 1 Feb 2021 11:46:43 -0500 Subject: [PATCH 1/2] move fc::blob to/from_variant out of libchain to fc --- .../chain/include/eosio/chain/database_utils.hpp | 11 ----------- libraries/fc | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libraries/chain/include/eosio/chain/database_utils.hpp b/libraries/chain/include/eosio/chain/database_utils.hpp index dbca3aa454c..27dcc6fb3bf 100644 --- a/libraries/chain/include/eosio/chain/database_utils.hpp +++ b/libraries/chain/include/eosio/chain/database_utils.hpp @@ -196,17 +196,6 @@ namespace fc { b = eosio::chain::shared_blob(_s.begin(), _s.end(), b.get_allocator()); } - inline - void to_variant( const blob& b, variant& v ) { - v = variant(base64_encode(b.data.data(), b.data.size())); - } - - inline - void from_variant( const variant& v, blob& b ) { - string _s = base64_decode(v.as_string()); - b.data = std::vector<char>(_s.begin(), _s.end()); - } - template<typename T> void to_variant( const eosio::chain::shared_vector<T>& sv, variant& v ) { to_variant(std::vector<T>(sv.begin(), sv.end()), v); diff --git a/libraries/fc b/libraries/fc index 40e443aeb29..456ee3554e5 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 40e443aeb29076bbd5575a2f78f1bf18d65f6826 +Subproject commit 456ee3554e5cd7cabffd721f991f8f2026b925b1 From 31e07d2590aba345ab44323c66dc7ba0c44a7deb Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 1 Feb 2021 12:28:24 -0500 Subject: [PATCH 2/2] bump fc to eosio branch HEAD --- libraries/fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fc b/libraries/fc index 456ee3554e5..4eb29507d06 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 456ee3554e5cd7cabffd721f991f8f2026b925b1 +Subproject commit 4eb29507d06d046c3c5f22ecedbab10ef324ae42