refactor: Use Txid in CMerkleBlock #28958

pull maflcko wants to merge 1 commits into bitcoin:master from maflcko:2311-ref-txid- changing 5 files +15 −14

maflcko commented at 3:55 PM on November 28, 2023: member

This should also fix a gcc-13 compiler warning, see #28922 (review)

rpc/txoutproof.cpp: In lambda function:
rpc/txoutproof.cpp:72:33: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
   72 |                     const Coin& coin = AccessByTxid(active_chainstate.CoinsTip(), Txid::FromUint256(tx));
      |                                 ^~~~
rpc/txoutproof.cpp:72:52: note: the temporary was destroyed at the end of the full expression ‘AccessByTxid((*(const CCoinsViewCache*)(&(& active_chainstate)->Chainstate::CoinsTip())), transaction_identifier<false>::FromUint256((* & tx)))’
   72 |                     const Coin& coin = AccessByTxid(active_chainstate.CoinsTip(), Txid::FromUint256(tx));
      |                                        ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1plus: all warnings being treated as errors

DrahtBot commented at 3:55 PM on November 28, 2023: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage

For detailed information about the code coverage, see the test coverage report.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK TheCharlatan, dergoegge

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
DrahtBot added the label Refactoring on Nov 28, 2023
maflcko force-pushed on Nov 28, 2023
maflcko force-pushed on Nov 28, 2023
maflcko force-pushed on Nov 28, 2023
dergoegge commented at 4:07 PM on November 28, 2023: member

Concept ACK

Type	Reviewers
ACK	TheCharlatan, dergoegge

in src/test/merkleblock_tests.cpp:30 in fa665711a0 outdated

  28 | -    uint256 txhash1 = uint256S("0x74d681e0e03bafa802c8aa084379aa98d9fcd632ddc2ed9782b586ec87451f20");
  29 | +    Txid txhash1{Txid::FromUint256(uint256S("0x74d681e0e03bafa802c8aa084379aa98d9fcd632ddc2ed9782b586ec87451f20"))};
  30 |  
  31 |      // Second txn in block.
  32 | -    uint256 txhash2 = uint256S("0xf9fc751cb7dc372406a9f8d738d5e6f8f63bab71986a39cf36ee70ee17036d07");
  33 | +    Txid txhash2{Txid::FromUint256(uint256S("0xf9fc751cb7dc372406a9f8d738d5e6f8f63bab71986a39cf36ee70ee17036d07"))};

dergoegge commented at 4:17 PM on November 28, 2023:

nit: Could use TxidFromString here

maflcko commented at 4:50 PM on November 28, 2023:

Thanks, done

dergoegge approved
dergoegge commented at 4:19 PM on November 28, 2023: member

Code review ACK fa665711a00b2e39954848160b3e70c60730b276
TheCharlatan approved
TheCharlatan commented at 4:47 PM on November 28, 2023: contributor

ACK fa665711a00b2e39954848160b3e70c60730b276
refactor: Use Txid in CMerkleBlock fa02c08c93
maflcko force-pushed on Nov 28, 2023
TheCharlatan commented at 7:33 AM on November 29, 2023: contributor

Re-ACK fa02c08c93e5867b7ea07d79ca1c0917dcde88e0
DrahtBot requested review from dergoegge on Nov 29, 2023
dergoegge approved
dergoegge commented at 10:04 AM on November 29, 2023: member

reACK fa02c08c93e5867b7ea07d79ca1c0917dcde88e0
fanquake merged this on Nov 29, 2023
fanquake closed this on Nov 29, 2023
fanquake commented at 10:55 AM on November 29, 2023: member

cc @achow101
maflcko deleted the branch on Nov 29, 2023
achow101 commented at 5:24 PM on November 29, 2023: member

Post merge ACK fa02c08c93e5867b7ea07d79ca1c0917dcde88e0
bitcoin locked this on Nov 28, 2024

Contributors

Labels

Linked (view graph)

#28922 Use Txid in COutpoint

refactor: Use Txid in CMerkleBlock #28958

Code Coverage

Reviews