From d0aaad611745710841341bd030a1ac80afb760a1 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Sun, 21 Jun 2015 16:04:19 +0200 Subject: [PATCH 1/2] Deprecated + unused + identical to key_to_wif --- .../graphene/utilities/key_conversion.hpp | 1 - libraries/utilities/key_conversion.cpp | 18 ------------------ 2 files changed, 19 deletions(-) diff --git a/libraries/utilities/include/graphene/utilities/key_conversion.hpp b/libraries/utilities/include/graphene/utilities/key_conversion.hpp index c5aa39ac..0c140b9d 100644 --- a/libraries/utilities/include/graphene/utilities/key_conversion.hpp +++ b/libraries/utilities/include/graphene/utilities/key_conversion.hpp @@ -23,7 +23,6 @@ namespace graphene { namespace utilities { -std::string key_to_wif_single_hash(const fc::ecc::private_key& key); std::string key_to_wif(const fc::ecc::private_key& key); fc::optional wif_to_key( const std::string& wif_key ); diff --git a/libraries/utilities/key_conversion.cpp b/libraries/utilities/key_conversion.cpp index b70210fa..1fff6776 100644 --- a/libraries/utilities/key_conversion.cpp +++ b/libraries/utilities/key_conversion.cpp @@ -35,24 +35,6 @@ std::string key_to_wif(const fc::ecc::private_key& key) return fc::to_base58(data, sizeof(data)); } -/** - * @deprecated - this is for backward compatibility of keys generated - */ -std::string key_to_wif_single_hash(const fc::ecc::private_key& key) -{ - fc::sha256 secret = key.get_secret(); - const size_t size_of_data_to_hash = sizeof(secret) + 1; - const size_t size_of_hash_bytes = 4; - char data[size_of_data_to_hash + size_of_hash_bytes]; - data[0] = (char)0x80; - memcpy(&data[1], (char*)&secret, sizeof(secret)); - fc::sha256 digest = fc::sha256::hash(data, size_of_data_to_hash); - digest = fc::sha256::hash(digest); - memcpy(data + size_of_data_to_hash, (char*)&digest, size_of_hash_bytes); - return fc::to_base58(data, sizeof(data)); -} - - fc::optional wif_to_key( const std::string& wif_key ) { std::vector wif_bytes = fc::from_base58(wif_key); From 9beff42daa02b1b56c70413133b9a2af2fbe1cf5 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Tue, 30 Jun 2015 12:02:47 +0200 Subject: [PATCH 2/2] Unused code --- libraries/chain/db_balance.cpp | 6 ------ libraries/chain/include/graphene/chain/database.hpp | 2 -- 2 files changed, 8 deletions(-) diff --git a/libraries/chain/db_balance.cpp b/libraries/chain/db_balance.cpp index 7873cbfb..bb4d3bab 100644 --- a/libraries/chain/db_balance.cpp +++ b/libraries/chain/db_balance.cpp @@ -73,12 +73,6 @@ void database::adjust_balance(const account_object& account, asset delta ) adjust_balance( account.id, delta); } -// TODO: This method should be removed -void database::adjust_balance(const account_object* account, asset delta) -{ - adjust_balance(*account, delta); -} - void database::adjust_core_in_orders( const account_object& acnt, asset delta ) { if( delta.asset_id == asset_id_type(0) && delta.amount != 0 ) diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index ac940567..b36f5e11 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -330,8 +330,6 @@ namespace graphene { namespace chain { void adjust_balance(account_id_type account, asset delta); /// This is an overloaded method. void adjust_balance(const account_object& account, asset delta); - /// This is an overloaded method. - void adjust_balance(const account_object* account, asset delta); /** * If delta.asset_id is a core asset, adjusts account statistics