Differential D10250

[avalanche] Extract a template class from BlockUpdate
ClosedPublic
Actions

Authored by Fabien on Oct 4 2021, 13:47.

Details

Reviewers

PiRK

Group Reviewers

Restricted Project

Maniphest Tasks

Restricted Maniphest Task

Commits

rABCab6106af42d1: [avalanche] Extract a template class from BlockUpdate

Summary

So we can reuse it for conflicting proofs as well. Note that this removes the space optimization (using the 2 LSB from the pointer to store the status) because conflicting proofs will use a std::shared_ptr<Proof> which can't be cast to uintptr_t.

There is no change in behavior.

Ref T1854.

Depends on D10249.

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

Fabien created this revision.Oct 4 2021, 13:47

Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 4 2021, 13:47

Fabien requested review of this revision.Oct 4 2021, 13:47

Harbormaster completed remote builds in B16874: Diff 30291.Oct 4 2021, 13:59

Rebase

Harbormaster completed remote builds in B16879: Diff 30301.Oct 5 2021, 07:23

Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Tail of the build log:

[0m[0;32mrpc_preciousblock.py                    | ✓ Passed  | 1 s
[0m[0;32mrpc_psbt.py                             | ✓ Passed  | 28 s
[0m[0;32mrpc_rawtransaction.py                   | ✓ Passed  | 13 s
[0m[0;32mrpc_scantxoutset.py                     | ✓ Passed  | 3 s
[0m[0;32mrpc_setban.py                           | ✓ Passed  | 2 s
[0m[0;32mrpc_signmessage.py                      | ✓ Passed  | 1 s
[0m[0;32mrpc_signrawtransaction.py               | ✓ Passed  | 1 s
[0m[0;32mrpc_txoutproof.py                       | ✓ Passed  | 2 s
[0m[0;32mrpc_uptime.py                           | ✓ Passed  | 1 s
[0m[0;32mrpc_users.py                            | ✓ Passed  | 5 s
[0m[0;32mrpc_whitelist.py                        | ✓ Passed  | 1 s
[0m[0;32mtool_wallet.py                          | ✓ Passed  | 4 s
[0m[0;32mwallet_abandonconflict.py               | ✓ Passed  | 6 s
[0m[0;32mwallet_address_types.py                 | ✓ Passed  | 14 s
[0m[0;32mwallet_avoidreuse.py                    | ✓ Passed  | 4 s
[0m[0;32mwallet_backup.py                        | ✓ Passed  | 26 s
[0m[0;32mwallet_balance.py                       | ✓ Passed  | 10 s
[0m[0;32mwallet_basic.py                         | ✓ Passed  | 20 s
[0m[0;32mwallet_coinbase_category.py             | ✓ Passed  | 1 s
[0m[0;32mwallet_create_tx.py                     | ✓ Passed  | 5 s
[0m[0;32mwallet_createwallet.py                  | ✓ Passed  | 2 s
[0m[0;32mwallet_createwallet.py --usecli         | ✓ Passed  | 3 s
[0m[0;32mwallet_descriptor.py                    | ✓ Passed  | 6 s
[0m[0;32mwallet_disable.py                       | ✓ Passed  | 1 s
[0m[0;32mwallet_dump.py                          | ✓ Passed  | 4 s
[0m[0;32mwallet_encryption.py                    | ✓ Passed  | 5 s
[0m[0;32mwallet_hd.py                            | ✓ Passed  | 7 s
[0m[0;32mwallet_import_rescan.py                 | ✓ Passed  | 4 s
[0m[0;32mwallet_import_with_label.py             | ✓ Passed  | 1 s
[0m[0;32mwallet_importdescriptors.py             | ✓ Passed  | 7 s
[0m[0;32mwallet_importmulti.py                   | ✓ Passed  | 3 s
[0m[0;32mwallet_importprunedfunds.py             | ✓ Passed  | 2 s
[0m[0;32mwallet_keypool.py                       | ✓ Passed  | 3 s
[0m[0;32mwallet_keypool_topup.py                 | ✓ Passed  | 3 s
[0m[0;32mwallet_labels.py                        | ✓ Passed  | 1 s
[0m[0;32mwallet_listreceivedby.py                | ✓ Passed  | 22 s
[0m[0;32mwallet_listsinceblock.py                | ✓ Passed  | 3 s
[0m[0;32mwallet_listtransactions.py              | ✓ Passed  | 11 s
[0m[0;32mwallet_multiwallet.py                   | ✓ Passed  | 43 s
[0m[0;32mwallet_multiwallet.py --usecli          | ✓ Passed  | 11 s
[0m[0;32mwallet_reorgsrestore.py                 | ✓ Passed  | 3 s
[0m[0;32mwallet_resendwallettransactions.py      | ✓ Passed  | 6 s
[0m[0;32mwallet_startup.py                       | ✓ Passed  | 2 s
[0m[0;32mwallet_txn_clone.py                     | ✓ Passed  | 2 s
[0m[0;32mwallet_txn_clone.py --mineblock         | ✓ Passed  | 3 s
[0m[0;32mwallet_txn_doublespend.py               | ✓ Passed  | 1 s
[0m[0;32mwallet_txn_doublespend.py --mineblock   | ✓ Passed  | 3 s
[0m[0;32mwallet_watchonly.py                     | ✓ Passed  | 1 s
[0m[0;32mwallet_watchonly.py --usecli            | ✓ Passed  | 1 s
[0m[1m
ALL                                     | ✓ Passed  | 1020 s (accumulated) 
[0mRuntime: 204 s

----------------------------------------------------------------------
Ran 8 tests in 0.009s

OK

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1

PiRK accepted this revision.Oct 5 2021, 16:35

This revision is now accepted and ready to land.Oct 5 2021, 16:35

Return status by ref, keep a both const and non const accessors for the item (will be useful in tests)

Harbormaster completed remote builds in B16895: Diff 30329.Oct 6 2021, 08:02

Fabien added a child revision: D10271: [avalanche] Register votes on conflicting proofs.Oct 6 2021, 13:47

Closed by commit rABCab6106af42d1: [avalanche] Extract a template class from BlockUpdate (authored by Fabien). · Explain WhyOct 12 2021, 08:35

This revision was automatically updated to reflect the committed changes.

Fabien added a commit: rABCab6106af42d1: [avalanche] Extract a template class from BlockUpdate.