From f457ae9725a186d2f870dbfbfbc9cfbdb1d2fe5c Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Sat, 14 Mar 2020 03:04:53 +0100 Subject: [PATCH] Remove dead code --- .../sidechain_net_handler.hpp | 5 ---- .../sidechain_net_handler_bitcoin.hpp | 5 ---- .../sidechain_net_handler_peerplays.hpp | 5 ---- .../sidechain_net_handler_bitcoin.cpp | 25 ++----------------- .../sidechain_net_handler_peerplays.cpp | 16 ------------ 5 files changed, 2 insertions(+), 54 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp index 11a66569..1c51771f 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp @@ -37,11 +37,6 @@ protected: std::map private_keys; - virtual std::string create_multisignature_wallet(const std::vector public_keys) = 0; - virtual std::string transfer(const std::string &from, const std::string &to, const uint64_t amount) = 0; - virtual std::string sign_transaction(const std::string &transaction) = 0; - virtual std::string send_transaction(const std::string &transaction) = 0; - private: }; diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp index 3bc629ba..90af94e5 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp @@ -101,12 +101,7 @@ private: std::unique_ptr bitcoin_client; std::unique_ptr listener; - std::string create_multisignature_wallet(const std::vector public_keys) override; - std::string transfer(const std::string &from, const std::string &to, const uint64_t amount) override; - std::string sign_transaction(const std::string &transaction) override; - std::string send_transaction(const std::string &transaction) override; std::string sign_and_send_transaction_with_wallet(const std::string &tx_json); - std::string create_weighted_multisignature_wallet(const std::vector> &public_keys); void transfer_all_btc(const std::string &from_address, const vector &from_sons, const std::string &to_address); std::string transfer_deposit_to_primary_wallet(const son_wallet_deposit_object &swdo); std::string transfer_withdrawal_from_primary_wallet(const son_wallet_withdraw_object &swwo); diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp index 82f6e7ba..720c7c38 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp @@ -20,11 +20,6 @@ public: void complete_signing() override; private: - std::string create_multisignature_wallet(const std::vector public_keys) override; - std::string transfer(const std::string &from, const std::string &to, const uint64_t amount) override; - std::string sign_transaction(const std::string &transaction) override; - std::string send_transaction(const std::string &transaction) override; - void on_applied_block(const signed_block &b); }; diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 537db0dc..ae124133 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -631,7 +631,8 @@ void sidechain_net_handler_bitcoin::recreate_primary_wallet() { si.total_votes)); } - string address = create_weighted_multisignature_wallet(son_pubkeys_bitcoin); + string address = get_weighted_multisig_address(son_pubkeys_bitcoin); + bitcoin_client->importaddress(address); ilog(address); @@ -754,28 +755,6 @@ void sidechain_net_handler_bitcoin::complete_signing() { }); } -std::string sidechain_net_handler_bitcoin::create_multisignature_wallet(const std::vector public_keys) { - return bitcoin_client->addmultisigaddress(public_keys); -} - -std::string sidechain_net_handler_bitcoin::create_weighted_multisignature_wallet(const std::vector> &public_keys) { - string address = get_weighted_multisig_address(public_keys); - bitcoin_client->importaddress(address); - return address; -} - -std::string sidechain_net_handler_bitcoin::transfer(const std::string &from, const std::string &to, const uint64_t amount) { - return ""; -} - -std::string sidechain_net_handler_bitcoin::sign_transaction(const std::string &transaction) { - return ""; -} - -std::string sidechain_net_handler_bitcoin::send_transaction(const std::string &transaction) { - return ""; -} - std::string sidechain_net_handler_bitcoin::sign_and_send_transaction_with_wallet(const std::string &tx_json) { if (!wallet_password.empty()) { bitcoin_client->walletpassphrase(wallet_password, 60); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp index af00f675..34b1d9d9 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp @@ -45,22 +45,6 @@ void sidechain_net_handler_peerplays::process_signing() { void sidechain_net_handler_peerplays::complete_signing() { } -std::string sidechain_net_handler_peerplays::create_multisignature_wallet(const std::vector public_keys) { - return ""; -} - -std::string sidechain_net_handler_peerplays::transfer(const std::string &from, const std::string &to, const uint64_t amount) { - return ""; -} - -std::string sidechain_net_handler_peerplays::sign_transaction(const std::string &transaction) { - return ""; -} - -std::string sidechain_net_handler_peerplays::send_transaction(const std::string &transaction) { - return ""; -} - void sidechain_net_handler_peerplays::on_applied_block(const signed_block &b) { for (const auto &trx : b.transactions) { size_t operation_index = -1;