Clean up CMerkleTx::SetMerkleBranch. #4787

pull domob1812 wants to merge 1 commits into bitcoin:master from domob1812:cleanup-setmerklebranch changing 2 files +19 −33

domob1812 commented at 6:37 PM on August 29, 2014: contributor

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.
sipa commented at 12:15 AM on August 30, 2014: member

Untested ACK, but can this be done after #4778?
domob1812 commented at 1:35 PM on August 30, 2014: contributor

Of course. Just ping me here when #4778 is merged and I'll rebase my changes.
jgarzik commented at 1:59 PM on August 30, 2014: contributor

@domob1812 Merged it last night :)

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.

4b0deb3b2d

domob1812 force-pushed on Aug 30, 2014
domob1812 commented at 4:02 PM on August 30, 2014: contributor

My bad, didn't look close enough. ;) Rebased.
BitcoinPullTester commented at 4:16 PM on August 30, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4787_4b0deb3b2df5882061ae6c44947eda831420cd5e/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
TheBlueMatt commented at 6:35 AM on September 2, 2014: member

ut ACK.
laanwj merged this on Sep 22, 2014
laanwj closed this on Sep 22, 2014
laanwj referenced this in commit 3cdae61aa2 on Sep 22, 2014
domob1812 deleted the branch on Sep 22, 2014
DrahtBot locked this on Sep 8, 2021

Contributors