refactoring: Drop UpdateTransaction in favor of UpdateInput #13269

pull Empact wants to merge 1 commits into bitcoin:master from Empact:update-transaction changing 7 files +14 −21

Empact commented at 1:00 AM on May 18, 2018: member

Updating the input explicitly requires the caller to present a mutable input, which more clearly communicates the effects and intent of the call (and, often, the enclosing loop).

In most cases, this input is already immediately available and need not be looked up.
fanquake added the label Refactoring on May 18, 2018
kallewoof approved
kallewoof commented at 5:22 AM on May 18, 2018: member

utACK 49d8e2d3ee4e50f625137204432780f85125af28

Looks like a clear win to me.

in src/test/transaction_tests.cpp:632 in 49d8e2d3ee outdated

 628 | @@ -629,7 +629,7 @@ BOOST_AUTO_TEST_CASE(test_witness)
 629 |      CreateCreditAndSpend(keystore2, scriptMulti, output2, input2, false);
 630 |      CheckWithFlag(output2, input2, 0, false);
 631 |      BOOST_CHECK(*output1 == *output2);
 632 | -    UpdateTransaction(input1, 0, CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));
 633 | +    UpdateInput(input1.vin.at(0), CombineSignatures(output1->vout[0].scriptPubKey, MutableTransactionSignatureChecker(&input1, 0, output1->vout[0].nValue), DataFromTransaction(input1, 0), DataFromTransaction(input2, 0)));

promag commented at 3:08 PM on May 18, 2018:

Replace all .at() usages with operator[].

Empact commented at 6:06 PM on May 18, 2018:

Thanks, I used at because UpdateTransaction asserted on the length, so it seemed more consistent, but I see now that CreateCreditAndSpend consistently creates this input.

promag commented at 3:10 PM on May 18, 2018: member

Concept ACK.
Empact force-pushed on May 18, 2018

Drop UpdateTransaction in favor of UpdateInput

Updating the input explicitly requires the caller to present a mutable
input, which more clearly communicates the effects and intent of the method.

In most cases, this input is already immediately available and need not be
looked up.

6aa33feadb

Empact force-pushed on May 18, 2018
promag commented at 3:33 PM on May 21, 2018: member

utACK 6aa33fe.
MarcoFalke commented at 3:55 PM on May 21, 2018: member

utACK 6aa33feadbe11bfa505a80a691d84db966aca134
laanwj commented at 5:06 PM on June 5, 2018: member

utACK 6aa33feadbe11bfa505a80a691d84db966aca134
laanwj merged this on Jun 5, 2018
laanwj closed this on Jun 5, 2018
laanwj referenced this in commit f0fd39f376 on Jun 5, 2018
Empact deleted the branch on Jul 2, 2018
kittywhiskers referenced this in commit 39cd39f4ce on Jun 4, 2021
kittywhiskers referenced this in commit 4cb155e3e8 on Jun 4, 2021
UdjinM6 referenced this in commit 8fb8a12271 on Jun 7, 2021
barrystyle referenced this in commit acb122e6cf on Jun 8, 2021
barrystyle referenced this in commit 9166796714 on Jun 8, 2021
kittywhiskers referenced this in commit fd6fe1c89b on Jun 9, 2021
UdjinM6 referenced this in commit aac1e34aad on Jun 19, 2021
UdjinM6 referenced this in commit e03b4c0ef8 on Jun 24, 2021
UdjinM6 referenced this in commit b72833ebaf on Jun 26, 2021
UdjinM6 referenced this in commit f159f31761 on Jun 26, 2021
UdjinM6 referenced this in commit f679d8c788 on Jun 28, 2021
kittywhiskers referenced this in commit 41a82cecd4 on Jul 9, 2021
kittywhiskers referenced this in commit 427e09bd0c on Jul 13, 2021
kittywhiskers referenced this in commit dae890b516 on Jul 13, 2021
PastaPastaPasta referenced this in commit e98241da5d on Jul 13, 2021
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels