diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index c49cefbeb6a857260c9a5f89cc98f6a25bfb34f6..c2ed25de31cc411a8d85661595efdaf89e24b58b 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -14,6 +14,8 @@ add_library( eos_chain block_log.cpp BlockchainConfiguration.cpp + types.cpp + ${HEADERS} ) diff --git a/libraries/chain/include/eos/chain/type_object.hpp b/libraries/chain/include/eos/chain/type_object.hpp index 476736495678cdb760439cf78bdaafed3eb796b1..8817717edaa21d3ef02b6b3faa8d4704d6236706 100644 --- a/libraries/chain/include/eos/chain/type_object.hpp +++ b/libraries/chain/include/eos/chain/type_object.hpp @@ -38,6 +38,7 @@ namespace eos { namespace chain { TypeName base; shared_vector fields; }; + using type_id_type = type_object::id_type; struct by_scope_name; using type_index = chainbase::shared_multi_index_container< @@ -57,4 +58,6 @@ namespace eos { namespace chain { CHAINBASE_SET_INDEX_TYPE(eos::chain::type_object, eos::chain::type_index) +FC_REFLECT(chainbase::oid, (_id)) + FC_REFLECT(eos::chain::type_object, (id)(scope)(name)(base_scope)(base)(fields) ) diff --git a/libraries/chain/include/eos/chain/types.hpp b/libraries/chain/include/eos/chain/types.hpp index 64852f1c03331662ab68b52b270089dfc0deb47a..088a6bda5a4915e3fc988d949e0d9681313512d3 100644 --- a/libraries/chain/include/eos/chain/types.hpp +++ b/libraries/chain/include/eos/chain/types.hpp @@ -179,6 +179,11 @@ namespace eos { namespace chain { } } // eos::chain +namespace fc { + void to_variant(const shared_vector& c, fc::variant& v); + void from_variant(const fc::variant& v, shared_vector& fields); +} + FC_REFLECT_ENUM(eos::chain::object_type, (null_object_type) (account_object_type) diff --git a/libraries/chain/types.cpp b/libraries/chain/types.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9a1c5e4860e49d09048169cc892565266ae8bf5c --- /dev/null +++ b/libraries/chain/types.cpp @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2017, Respective Authors. + * + * The MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include + +namespace fc { + using eos::chain::shared_vector; + void to_variant(const shared_vector& c, fc::variant& v) { + fc::mutable_variant_object mvo; mvo.reserve(c.size()); + for(const auto& f : c) { + mvo.set(f.name, eos::types::String(f.type)); + } + v = std::move(mvo); + } + void from_variant(const fc::variant& v, shared_vector& fields) { + const auto& obj = v.get_object(); + fields.reserve(obj.size()); + for(const auto& f : obj) + fields.emplace_back(eos::types::Field{ f.key(), f.value().get_string() }); + } +}