diff options
| author | Daniel Kraft <d@domob.eu> | 2014-08-29 20:24:16 +0200 |
|---|---|---|
| committer | Daniel Kraft <d@domob.eu> | 2014-08-30 18:00:55 +0200 |
| commit | 4b0deb3b2df5882061ae6c44947eda831420cd5e (patch) | |
| tree | 0f92881b989b537c4bf79edbd35b472ea7b3be7f /src/wallet.h | |
| parent | 9f3d47677973cb894fdbb437b9b322e2062a1bf1 (diff) | |
| download | bitcoin-4b0deb3b2df5882061ae6c44947eda831420cd5e.tar.xz | |
Clean up CMerkleTx::SetMerkleBranch.
The case SetMerkleBranch(NULL) was never actually used, and thus the
involved code (loading the block from disk) can be removed and the
implementation simplified.
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index 544b4f5bfb..3becc396c1 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -500,7 +500,7 @@ public: ) - int SetMerkleBranch(const CBlock* pblock=NULL); + int SetMerkleBranch(const CBlock& block); // Return depth of transaction in blockchain: // -1 : not in blockchain, and not in memory pool (conflicted transaction) |