diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-04-02 10:30:41 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-04-02 10:30:57 -0400 |
commit | 8dbb2c5e67043a4ba3bff9030fd465c28bb21f96 (patch) | |
tree | b9e9a152afdf9333b39ac477fcb4f53cebbbeb03 /src/wallet/wallet.h | |
parent | 5a2a9b5b0603c1206e4419ffd0fd0d4939813fc2 (diff) | |
parent | ea1a2d8794ffb6b814e7120fb8ba0cc4aa7ebf3d (diff) | |
download | bitcoin-8dbb2c5e67043a4ba3bff9030fd465c28bb21f96.tar.xz |
Merge #15680: Remove resendwallettransactions RPC method
ea1a2d8794 [wallet] Remove ResendWalletTransactionsBefore (John Newbery)
f5162458cd [rpc] remove resendwallettransactions RPC (John Newbery)
Pull request description:
Remove resendwallettransactions RPC method
This RPC was added for testing wallet rebroadcasts. Since we now have a real test for wallet rebroadcasts, it's no longer needed.
The call in wallet_basic.py can be removed because wallet_resendwallettransactions.py tests wallet rebroadcast.
ACKs for commit ea1a2d:
MarcoFalke:
re-utACK ea1a2d8794
promag:
utACK ea1a2d8.
Tree-SHA512: 48245d947be1a2d2b8c30d2946105818c454a03b70b63534ecadf2144da64dafe1c9527ea670a5f4d1acd05ccdfc6c9be43ca636ee2ba58a8b7a7b2fc7bc88fd
Diffstat (limited to 'src/wallet/wallet.h')
-rw-r--r-- | src/wallet/wallet.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 24a1b92f7d..5960fc1c71 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -947,8 +947,6 @@ public: void TransactionRemovedFromMempool(const CTransactionRef &ptx) override; void ReacceptWalletTransactions(interfaces::Chain::Lock& locked_chain) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); void ResendWalletTransactions(interfaces::Chain::Lock& locked_chain, int64_t nBestBlockTime) override; - // ResendWalletTransactionsBefore may only be called if fBroadcastTransactions! - std::vector<uint256> ResendWalletTransactionsBefore(interfaces::Chain::Lock& locked_chain, int64_t nTime); CAmount GetBalance(const isminefilter& filter=ISMINE_SPENDABLE, const int min_depth=0) const; CAmount GetUnconfirmedBalance() const; CAmount GetImmatureBalance() const; |