From f547ea33c1822702d70d7c62db6c3b245532134f Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Fri, 27 Mar 2020 06:37:58 +0100 Subject: [PATCH] Fix duplicated typedef, peerplays_sidechain::sidechain_type to chain::sidechain_type --- libraries/app/database_api.cpp | 12 ++-- .../app/include/graphene/app/database_api.hpp | 4 +- .../chain/protocol/sidechain_address.hpp | 6 +- .../include/graphene/chain/protocol/son.hpp | 4 +- .../graphene/chain/protocol/son_wallet.hpp | 2 +- .../chain/sidechain_address_object.hpp | 10 ++-- .../include/graphene/chain/sidechain_defs.hpp | 6 -- .../chain/include/graphene/chain/son_info.hpp | 2 +- .../include/graphene/chain/son_object.hpp | 2 +- .../graphene/peerplays_sidechain/defs.hpp | 8 ++- .../wallet/include/graphene/wallet/wallet.hpp | 14 ++--- libraries/wallet/wallet.cpp | 24 ++++---- tests/cli/son.cpp | 56 +++++++++---------- tests/tests/sidechain_addresses_test.cpp | 14 ++--- tests/tests/son_operations_tests.cpp | 12 ++-- tests/tests/son_wallet_tests.cpp | 16 +++--- 16 files changed, 94 insertions(+), 98 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index c6c8a952..e14ebe5b 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -160,8 +160,8 @@ class database_api_impl : public std::enable_shared_from_this // Sidechain addresses vector> get_sidechain_addresses(const vector& sidechain_address_ids)const; vector> get_sidechain_addresses_by_account(account_id_type account)const; - vector> get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain)const; - fc::optional get_sidechain_address_by_account_and_sidechain(account_id_type account, peerplays_sidechain::sidechain_type sidechain)const; + vector> get_sidechain_addresses_by_sidechain(sidechain_type sidechain)const; + fc::optional get_sidechain_address_by_account_and_sidechain(account_id_type account, sidechain_type sidechain)const; uint64_t get_sidechain_addresses_count()const; // Votes @@ -1865,12 +1865,12 @@ vector> database_api_impl::get_sidechain_addr return result; } -vector> database_api::get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain)const +vector> database_api::get_sidechain_addresses_by_sidechain(sidechain_type sidechain)const { return my->get_sidechain_addresses_by_sidechain( sidechain ); } -vector> database_api_impl::get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain)const +vector> database_api_impl::get_sidechain_addresses_by_sidechain(sidechain_type sidechain)const { vector> result; const auto& sidechain_addresses_range = _db.get_index_type().indices().get().equal_range(sidechain); @@ -1881,12 +1881,12 @@ vector> database_api_impl::get_sidechain_addr return result; } -fc::optional database_api::get_sidechain_address_by_account_and_sidechain(account_id_type account, peerplays_sidechain::sidechain_type sidechain)const +fc::optional database_api::get_sidechain_address_by_account_and_sidechain(account_id_type account, sidechain_type sidechain)const { return my->get_sidechain_address_by_account_and_sidechain( account, sidechain ); } -fc::optional database_api_impl::get_sidechain_address_by_account_and_sidechain(account_id_type account, peerplays_sidechain::sidechain_type sidechain)const +fc::optional database_api_impl::get_sidechain_address_by_account_and_sidechain(account_id_type account, sidechain_type sidechain)const { const auto& idx = _db.get_index_type().indices().get(); auto itr = idx.find( boost::make_tuple( account, sidechain ) ); diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp index 76ef822c..6f258004 100644 --- a/libraries/app/include/graphene/app/database_api.hpp +++ b/libraries/app/include/graphene/app/database_api.hpp @@ -653,7 +653,7 @@ class database_api * @param sidechain Sidechain for which addresses should be retrieved * @return The sidechain addresses objects, or null if the sidechain does not have any addresses */ - vector> get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain)const; + vector> get_sidechain_addresses_by_sidechain(sidechain_type sidechain)const; /** * @brief Get the sidechain addresses for a given account and sidechain @@ -661,7 +661,7 @@ class database_api * @param sidechain Sidechain for which address should be retrieved * @return The sidechain addresses objects, or null if the account does not have a sidechain addresses for a given sidechain */ - fc::optional get_sidechain_address_by_account_and_sidechain(account_id_type account, peerplays_sidechain::sidechain_type sidechain)const; + fc::optional get_sidechain_address_by_account_and_sidechain(account_id_type account, sidechain_type sidechain)const; /** * @brief Get the total number of sidechain addresses registered with the blockchain diff --git a/libraries/chain/include/graphene/chain/protocol/sidechain_address.hpp b/libraries/chain/include/graphene/chain/protocol/sidechain_address.hpp index e79f65de..2702ce49 100644 --- a/libraries/chain/include/graphene/chain/protocol/sidechain_address.hpp +++ b/libraries/chain/include/graphene/chain/protocol/sidechain_address.hpp @@ -11,7 +11,7 @@ namespace graphene { namespace chain { asset fee; account_id_type sidechain_address_account; - graphene::peerplays_sidechain::sidechain_type sidechain; + sidechain_type sidechain; string deposit_address; string withdraw_address; @@ -26,7 +26,7 @@ namespace graphene { namespace chain { asset fee; sidechain_address_id_type sidechain_address_id; account_id_type sidechain_address_account; - graphene::peerplays_sidechain::sidechain_type sidechain; + sidechain_type sidechain; optional deposit_address; optional withdraw_address; @@ -41,7 +41,7 @@ namespace graphene { namespace chain { asset fee; sidechain_address_id_type sidechain_address_id; account_id_type sidechain_address_account; - graphene::peerplays_sidechain::sidechain_type sidechain; + sidechain_type sidechain; account_id_type fee_payer()const { return sidechain_address_account; } share_type calculate_fee(const fee_parameters_type& k)const { return 0; } diff --git a/libraries/chain/include/graphene/chain/protocol/son.hpp b/libraries/chain/include/graphene/chain/protocol/son.hpp index 3dfbc52d..fc6a3e0f 100644 --- a/libraries/chain/include/graphene/chain/protocol/son.hpp +++ b/libraries/chain/include/graphene/chain/protocol/son.hpp @@ -13,7 +13,7 @@ namespace graphene { namespace chain { std::string url; vesting_balance_id_type deposit; public_key_type signing_key; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; vesting_balance_id_type pay_vb; account_id_type fee_payer()const { return owner_account; } @@ -30,7 +30,7 @@ namespace graphene { namespace chain { optional new_url; optional new_deposit; optional new_signing_key; - optional> new_sidechain_public_keys; + optional> new_sidechain_public_keys; optional new_pay_vb; account_id_type fee_payer()const { return owner_account; } diff --git a/libraries/chain/include/graphene/chain/protocol/son_wallet.hpp b/libraries/chain/include/graphene/chain/protocol/son_wallet.hpp index f41cfa1f..5194bed2 100644 --- a/libraries/chain/include/graphene/chain/protocol/son_wallet.hpp +++ b/libraries/chain/include/graphene/chain/protocol/son_wallet.hpp @@ -25,7 +25,7 @@ namespace graphene { namespace chain { account_id_type payer; son_wallet_id_type son_wallet_id; - graphene::peerplays_sidechain::sidechain_type sidechain; + sidechain_type sidechain; string address; account_id_type fee_payer()const { return payer; } diff --git a/libraries/chain/include/graphene/chain/sidechain_address_object.hpp b/libraries/chain/include/graphene/chain/sidechain_address_object.hpp index 86e1b16d..ca28231b 100644 --- a/libraries/chain/include/graphene/chain/sidechain_address_object.hpp +++ b/libraries/chain/include/graphene/chain/sidechain_address_object.hpp @@ -21,12 +21,12 @@ namespace graphene { namespace chain { static const uint8_t type_id = sidechain_address_object_type; account_id_type sidechain_address_account; - graphene::peerplays_sidechain::sidechain_type sidechain; + sidechain_type sidechain; string deposit_address; string withdraw_address; sidechain_address_object() : - sidechain(graphene::peerplays_sidechain::sidechain_type::bitcoin), + sidechain(sidechain_type::bitcoin), deposit_address(""), withdraw_address("") {} }; @@ -45,17 +45,17 @@ namespace graphene { namespace chain { member >, ordered_non_unique< tag, - member + member >, ordered_unique< tag, composite_key, - member + member > >, ordered_unique< tag, composite_key, + member, member > > diff --git a/libraries/chain/include/graphene/chain/sidechain_defs.hpp b/libraries/chain/include/graphene/chain/sidechain_defs.hpp index 43e76e2d..6bbc8b5c 100644 --- a/libraries/chain/include/graphene/chain/sidechain_defs.hpp +++ b/libraries/chain/include/graphene/chain/sidechain_defs.hpp @@ -14,12 +14,6 @@ enum class sidechain_type { } } -namespace graphene { namespace peerplays_sidechain { - -using sidechain_type = graphene::chain::sidechain_type; - -} } - FC_REFLECT_ENUM(graphene::chain::sidechain_type, (unknown) (bitcoin) diff --git a/libraries/chain/include/graphene/chain/son_info.hpp b/libraries/chain/include/graphene/chain/son_info.hpp index 37d54e74..b85fb03a 100644 --- a/libraries/chain/include/graphene/chain/son_info.hpp +++ b/libraries/chain/include/graphene/chain/son_info.hpp @@ -14,7 +14,7 @@ namespace graphene { namespace chain { son_id_type son_id; weight_type weight = 0; public_key_type signing_key; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; bool operator==(const son_info& rhs) { bool son_sets_equal = diff --git a/libraries/chain/include/graphene/chain/son_object.hpp b/libraries/chain/include/graphene/chain/son_object.hpp index 5aee1265..0bc87ecc 100644 --- a/libraries/chain/include/graphene/chain/son_object.hpp +++ b/libraries/chain/include/graphene/chain/son_object.hpp @@ -70,7 +70,7 @@ namespace graphene { namespace chain { vesting_balance_id_type pay_vb; son_statistics_id_type statistics; son_status status = son_status::inactive; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; void pay_son_fee(share_type pay, database& db); }; diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/defs.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/defs.hpp index 6dd49252..95026c1b 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/defs.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/defs.hpp @@ -14,6 +14,8 @@ namespace graphene { namespace peerplays_sidechain { +using namespace graphene::chain; + using bytes = std::vector; struct prev_out { @@ -64,9 +66,9 @@ struct sidechain_event_data { std::string sidechain_to; std::string sidechain_currency; fc::safe sidechain_amount; - chain::account_id_type peerplays_from; - chain::account_id_type peerplays_to; - chain::asset peerplays_asset; + account_id_type peerplays_from; + account_id_type peerplays_to; + asset peerplays_asset; }; }} // namespace graphene::peerplays_sidechain diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp index 364fb20b..c14044e4 100644 --- a/libraries/wallet/include/graphene/wallet/wallet.hpp +++ b/libraries/wallet/include/graphene/wallet/wallet.hpp @@ -1320,7 +1320,7 @@ class wallet_api string url, vesting_balance_id_type deposit_id, vesting_balance_id_type pay_vb_id, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast = false); /** @@ -1335,7 +1335,7 @@ class wallet_api signed_transaction update_son(string owner_account, string url, string block_signing_key, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast = false); @@ -1422,7 +1422,7 @@ class wallet_api * @returns the signed transaction adding sidechain address */ signed_transaction add_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast = false); @@ -1439,7 +1439,7 @@ class wallet_api * @returns the signed transaction updating sidechain address */ signed_transaction update_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast = false); @@ -1452,7 +1452,7 @@ class wallet_api * @returns the signed transaction updating sidechain address */ signed_transaction delete_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, bool broadcast = false); /** Retrieves all sidechain addresses owned by given account. @@ -1467,7 +1467,7 @@ class wallet_api * @param sidechain the name of the sidechain * @returns the list of all sidechain addresses registered for a given sidechain. */ - vector> get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain); + vector> get_sidechain_addresses_by_sidechain(sidechain_type sidechain); /** Retrieves sidechain address owned by given account for a given sidechain. * @@ -1475,7 +1475,7 @@ class wallet_api * @param sidechain the name of the sidechain * @returns the sidechain address owned by given account for a given sidechain. */ - fc::optional get_sidechain_address_by_account_and_sidechain(string account, peerplays_sidechain::sidechain_type sidechain); + fc::optional get_sidechain_address_by_account_and_sidechain(string account, sidechain_type sidechain); /** Retrieves the total number of sidechain addresses registered in the system. * diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp index ea2434f6..989ca615 100644 --- a/libraries/wallet/wallet.cpp +++ b/libraries/wallet/wallet.cpp @@ -1865,7 +1865,7 @@ public: string url, vesting_balance_id_type deposit_id, vesting_balance_id_type pay_vb_id, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast /* = false */) { try { fc::scoped_lock lock(_resync_mutex); @@ -1899,7 +1899,7 @@ public: signed_transaction update_son(string owner_account, string url, string block_signing_key, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast /* = false */) { try { son_object son = get_son(owner_account); @@ -2026,7 +2026,7 @@ public: } FC_CAPTURE_AND_RETHROW() } signed_transaction add_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast /* = false */) @@ -2048,7 +2048,7 @@ public: } FC_CAPTURE_AND_RETHROW() } signed_transaction update_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast /* = false */) @@ -2074,7 +2074,7 @@ public: } FC_CAPTURE_AND_RETHROW() } signed_transaction delete_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, bool broadcast /* = false */) { try { account_id_type sidechain_address_account_id = get_account_id(account); @@ -4444,7 +4444,7 @@ signed_transaction wallet_api::create_son(string owner_account, string url, vesting_balance_id_type deposit_id, vesting_balance_id_type pay_vb_id, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast /* = false */) { return my->create_son(owner_account, url, deposit_id, pay_vb_id, sidechain_public_keys, broadcast); @@ -4453,7 +4453,7 @@ signed_transaction wallet_api::create_son(string owner_account, signed_transaction wallet_api::update_son(string owner_account, string url, string block_signing_key, - flat_map sidechain_public_keys, + flat_map sidechain_public_keys, bool broadcast /* = false */) { return my->update_son(owner_account, url, block_signing_key, sidechain_public_keys, broadcast); @@ -4501,7 +4501,7 @@ vector> wallet_api::get_son_wallets(uint32_t limit) } signed_transaction wallet_api::add_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast /* = false */) @@ -4510,7 +4510,7 @@ signed_transaction wallet_api::add_sidechain_address(string account, } signed_transaction wallet_api::update_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, string deposit_address, string withdraw_address, bool broadcast /* = false */) @@ -4519,7 +4519,7 @@ signed_transaction wallet_api::update_sidechain_address(string account, } signed_transaction wallet_api::delete_sidechain_address(string account, - peerplays_sidechain::sidechain_type sidechain, + sidechain_type sidechain, bool broadcast /* = false */) { return my->delete_sidechain_address(account, sidechain, broadcast); @@ -4531,12 +4531,12 @@ vector> wallet_api::get_sidechain_addresses_b return my->_remote_db->get_sidechain_addresses_by_account(account_id); } -vector> wallet_api::get_sidechain_addresses_by_sidechain(peerplays_sidechain::sidechain_type sidechain) +vector> wallet_api::get_sidechain_addresses_by_sidechain(sidechain_type sidechain) { return my->_remote_db->get_sidechain_addresses_by_sidechain(sidechain); } -fc::optional wallet_api::get_sidechain_address_by_account_and_sidechain(string account, peerplays_sidechain::sidechain_type sidechain) +fc::optional wallet_api::get_sidechain_address_by_account_and_sidechain(string account, sidechain_type sidechain) { account_id_type account_id = get_account_id(account); return my->_remote_db->get_sidechain_address_by_account_and_sidechain(account_id, sidechain); diff --git a/tests/cli/son.cpp b/tests/cli/son.cpp index 3630000c..46a1e253 100644 --- a/tests/cli/son.cpp +++ b/tests/cli/son.cpp @@ -40,7 +40,7 @@ public: } void create_son(const std::string& account_name, const std::string& son_url, - flat_map& sidechain_public_keys, + flat_map& sidechain_public_keys, bool generate_maintenance = true) { graphene::wallet::brain_key_info bki; @@ -112,16 +112,16 @@ BOOST_AUTO_TEST_CASE( create_sons ) BOOST_TEST_MESSAGE("SON cli wallet tests begin"); try { - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); auto son1_obj = con.wallet_api_ptr->get_son("son1account"); @@ -146,10 +146,10 @@ BOOST_AUTO_TEST_CASE( cli_update_son ) { BOOST_TEST_MESSAGE("Cli get_son and update_son Test"); - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; son_test_helper sth(*this); sth.create_son("sonmember", "http://sonmember", sidechain_public_keys); @@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE( cli_update_son ) // update SON sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; con.wallet_api_ptr->update_son("sonmember", "http://sonmember_updated", "", sidechain_public_keys, true); son_data = con.wallet_api_ptr->get_son("sonmember"); @@ -187,16 +187,16 @@ BOOST_AUTO_TEST_CASE( son_voting ) BOOST_TEST_MESSAGE("SON Vote cli wallet tests begin"); try { - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); BOOST_TEST_MESSAGE("Voting for SONs"); @@ -266,16 +266,16 @@ BOOST_AUTO_TEST_CASE( delete_son ) BOOST_TEST_MESSAGE("SON delete cli wallet tests begin"); try { - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); BOOST_TEST_MESSAGE("Deleting SONs"); @@ -314,13 +314,13 @@ BOOST_FIXTURE_TEST_CASE( select_top_fifteen_sons, cli_fixture ) gpo = con.wallet_api_ptr->get_global_properties(); unsigned int son_number = gpo.parameters.maximum_son_count; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; // create son accounts for(unsigned int i = 0; i < son_number + 1; i++) { sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); sth.create_son("sonaccount" + fc::to_pretty_string(i), "http://son" + fc::to_pretty_string(i), sidechain_public_keys, @@ -385,16 +385,16 @@ BOOST_AUTO_TEST_CASE( list_son ) BOOST_TEST_MESSAGE("List SONs cli wallet tests begin"); try { - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); auto res = con.wallet_api_ptr->list_sons("", 100); @@ -415,16 +415,16 @@ BOOST_AUTO_TEST_CASE( update_son_votes_test ) BOOST_TEST_MESSAGE("SON update_son_votes cli wallet tests begin"); try { - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); BOOST_TEST_MESSAGE("Vote for 2 accounts with update_son_votes"); @@ -572,16 +572,16 @@ BOOST_AUTO_TEST_CASE( related_functions ) global_property_object gpo = con.wallet_api_ptr->get_global_properties(); BOOST_CHECK(gpo.active_sons.size() == 0); - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; son_test_helper sth(*this); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 1"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 1"; sth.create_son("son1account", "http://son1", sidechain_public_keys); sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address 2"; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address 2"; sth.create_son("son2account", "http://son2", sidechain_public_keys); gpo = con.wallet_api_ptr->get_global_properties(); @@ -608,13 +608,13 @@ BOOST_FIXTURE_TEST_CASE( cli_list_active_sons, cli_fixture ) gpo = con.wallet_api_ptr->get_global_properties(); unsigned int son_number = gpo.parameters.maximum_son_count; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; // create son accounts for(unsigned int i = 0; i < son_number + 1; i++) { sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); sth.create_son("sonaccount" + fc::to_pretty_string(i), "http://son" + fc::to_pretty_string(i), sidechain_public_keys, @@ -674,13 +674,13 @@ BOOST_AUTO_TEST_CASE( maintenance_test ) gpo = con.wallet_api_ptr->get_global_properties(); unsigned int son_number = gpo.parameters.maximum_son_count; - flat_map sidechain_public_keys; + flat_map sidechain_public_keys; // create son accounts for(unsigned int i = 0; i < son_number + 1; i++) { sidechain_public_keys.clear(); - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin_address " + fc::to_pretty_string(i); sth.create_son("sonaccount" + fc::to_pretty_string(i), "http://son" + fc::to_pretty_string(i), sidechain_public_keys, diff --git a/tests/tests/sidechain_addresses_test.cpp b/tests/tests/sidechain_addresses_test.cpp index e65cf11e..e3fb115f 100644 --- a/tests/tests/sidechain_addresses_test.cpp +++ b/tests/tests/sidechain_addresses_test.cpp @@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE( sidechain_address_add_test ) { sidechain_address_add_operation op; op.sidechain_address_account = alice_id; - op.sidechain = graphene::peerplays_sidechain::sidechain_type::bitcoin; + op.sidechain = sidechain_type::bitcoin; op.deposit_address = "deposit_address"; op.withdraw_address = "withdraw_address"; @@ -43,10 +43,10 @@ BOOST_AUTO_TEST_CASE( sidechain_address_add_test ) { const auto& idx = db.get_index_type().indices().get(); BOOST_REQUIRE( idx.size() == 1 ); - auto obj = idx.find( boost::make_tuple( alice_id, graphene::peerplays_sidechain::sidechain_type::bitcoin ) ); + auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin ) ); BOOST_REQUIRE( obj != idx.end() ); BOOST_CHECK( obj->sidechain_address_account == alice_id ); - BOOST_CHECK( obj->sidechain == graphene::peerplays_sidechain::sidechain_type::bitcoin ); + BOOST_CHECK( obj->sidechain == sidechain_type::bitcoin ); BOOST_CHECK( obj->deposit_address == "deposit_address" ); BOOST_CHECK( obj->withdraw_address == "withdraw_address" ); } @@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE( sidechain_address_update_test ) { const auto& idx = db.get_index_type().indices().get(); BOOST_REQUIRE( idx.size() == 1 ); - auto obj = idx.find( boost::make_tuple( alice_id, graphene::peerplays_sidechain::sidechain_type::bitcoin ) ); + auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin ) ); BOOST_REQUIRE( obj != idx.end() ); std::string new_deposit_address = "new_deposit_address"; @@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE( sidechain_address_update_test ) { const auto& idx = db.get_index_type().indices().get(); BOOST_REQUIRE( idx.size() == 1 ); - auto obj = idx.find( boost::make_tuple( alice_id, graphene::peerplays_sidechain::sidechain_type::bitcoin ) ); + auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin ) ); BOOST_REQUIRE( obj != idx.end() ); BOOST_CHECK( obj->sidechain_address_account == obj->sidechain_address_account ); BOOST_CHECK( obj->sidechain == obj->sidechain ); @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE( sidechain_address_delete_test ) { const auto& idx = db.get_index_type().indices().get(); BOOST_REQUIRE( idx.size() == 1 ); - auto obj = idx.find( boost::make_tuple( alice_id, graphene::peerplays_sidechain::sidechain_type::bitcoin ) ); + auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin ) ); BOOST_REQUIRE( obj != idx.end() ); { @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( sidechain_address_delete_test ) { const auto& idx = db.get_index_type().indices().get(); BOOST_REQUIRE( idx.size() == 0 ); - auto obj = idx.find( boost::make_tuple( alice_id, graphene::peerplays_sidechain::sidechain_type::bitcoin ) ); + auto obj = idx.find( boost::make_tuple( alice_id, sidechain_type::bitcoin ) ); BOOST_REQUIRE( obj == idx.end() ); } } diff --git a/tests/tests/son_operations_tests.cpp b/tests/tests/son_operations_tests.cpp index a917e550..050b9c65 100644 --- a/tests/tests/son_operations_tests.cpp +++ b/tests/tests/son_operations_tests.cpp @@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE( create_son_test ) { // alice became son { - flat_map sidechain_public_keys; - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin address"; + flat_map sidechain_public_keys; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin address"; son_create_operation op; op.owner_account = alice_id; @@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE( create_son_test ) { BOOST_REQUIRE( obj != idx.end() ); BOOST_CHECK( obj->url == test_url ); BOOST_CHECK( obj->signing_key == alice_public_key ); - BOOST_CHECK( obj->sidechain_public_keys.at(graphene::peerplays_sidechain::sidechain_type::bitcoin) == "bitcoin address" ); + BOOST_CHECK( obj->sidechain_public_keys.at(sidechain_type::bitcoin) == "bitcoin address" ); BOOST_CHECK( obj->deposit.instance == deposit.instance.value ); BOOST_CHECK( obj->pay_vb.instance == payment.instance.value ); } @@ -118,8 +118,8 @@ BOOST_AUTO_TEST_CASE( update_son_test ) { std::string new_url = "https://anewurl.com"; { - flat_map sidechain_public_keys; - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "new bitcoin address"; + flat_map sidechain_public_keys; + sidechain_public_keys[sidechain_type::bitcoin] = "new bitcoin address"; son_update_operation op; op.son_id = son_id_type(0); @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE( update_son_test ) { auto obj = idx.find( alice_id ); BOOST_REQUIRE( obj != idx.end() ); BOOST_CHECK( obj->url == new_url ); - BOOST_CHECK( obj->sidechain_public_keys.at(graphene::peerplays_sidechain::sidechain_type::bitcoin) == "new bitcoin address" ); + BOOST_CHECK( obj->sidechain_public_keys.at(sidechain_type::bitcoin) == "new bitcoin address" ); } BOOST_AUTO_TEST_CASE( delete_son_test ) { diff --git a/tests/tests/son_wallet_tests.cpp b/tests/tests/son_wallet_tests.cpp index a8dfc382..cef29b54 100644 --- a/tests/tests/son_wallet_tests.cpp +++ b/tests/tests/son_wallet_tests.cpp @@ -71,8 +71,8 @@ BOOST_AUTO_TEST_CASE( son_wallet_recreate_test ) { // alice becomes son { - flat_map sidechain_public_keys; - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin address"; + flat_map sidechain_public_keys; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin address"; son_create_operation op; op.owner_account = alice_id; @@ -126,8 +126,8 @@ BOOST_AUTO_TEST_CASE( son_wallet_recreate_test ) { // bob becomes son { - flat_map sidechain_public_keys; - sidechain_public_keys[graphene::peerplays_sidechain::sidechain_type::bitcoin] = "bitcoin address"; + flat_map sidechain_public_keys; + sidechain_public_keys[sidechain_type::bitcoin] = "bitcoin address"; son_create_operation op; op.owner_account = bob_id; @@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE( son_wallet_recreate_test ) { si.son_id = son_id_type(0); si.weight = 1000; si.signing_key = alice_public_key; - si.sidechain_public_keys[peerplays_sidechain::sidechain_type::bitcoin] = ""; + si.sidechain_public_keys[sidechain_type::bitcoin] = ""; op.sons.push_back(si); } @@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE( son_wallet_recreate_test ) { si.son_id = son_id_type(1); si.weight = 1000; si.signing_key = bob_public_key; - si.sidechain_public_keys[peerplays_sidechain::sidechain_type::bitcoin] = ""; + si.sidechain_public_keys[sidechain_type::bitcoin] = ""; op.sons.push_back(si); } @@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE( son_wallet_update_test ) { op.payer = db.get_global_properties().parameters.son_account(); op.son_wallet_id = son_wallet_id_type(0); - op.sidechain = graphene::peerplays_sidechain::sidechain_type::bitcoin; + op.sidechain = sidechain_type::bitcoin; op.address = "bitcoin address"; trx.operations.push_back(op); @@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE( son_wallet_update_test ) { BOOST_REQUIRE( idx.size() == 1 ); auto obj = idx.find(son_wallet_id_type(0)); BOOST_REQUIRE( obj != idx.end() ); - BOOST_REQUIRE( obj->addresses.at(graphene::peerplays_sidechain::sidechain_type::bitcoin) == "bitcoin address" ); + BOOST_REQUIRE( obj->addresses.at(sidechain_type::bitcoin) == "bitcoin address" ); } }