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.
This commit is contained in:
Daniel Kraft
2014-08-29 20:24:16 +02:00
parent 9f3d476779
commit 4b0deb3b2d
2 changed files with 19 additions and 33 deletions

View File

@@ -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)