walletdb: Remove BerkeleyBatch friend class from BerkeleyDatabase
ClosedPublic
Actions

Authored by PiRK on Sep 3 2021, 17:11.

Details

Reviewers

deadalnix

Group Reviewers

Restricted Project

Commits

rABC5cbb600772e0: walletdb: Remove BerkeleyBatch friend class from BerkeleyDatabase

Summary

This is a backport of core#19335 [5/5]
https://github.com/bitcoin/bitcoin/pull/19335/commits/74507ce71eb61105fb3ae8460999099234ca7b8b

Depends on D10037

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 16559
Build 32973: Build Diff	lint-circular-dependencies · build-without-wallet · build-debug · build-clang-tidy · build-clang · build-diff
Build 32972: arc lint + arc unit

Event Timeline

PiRK created this revision.Sep 3 2021, 17:11

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 3 2021, 17:11

PiRK requested review of this revision.Sep 3 2021, 17:11

teamcity edited the summary of this revision. (Show Details)Sep 3 2021, 17:12

Harbormaster completed remote builds in B16541: Diff 29775.Sep 3 2021, 17:43

deadalnix accepted this revision.Sep 5 2021, 19:54

This revision is now accepted and ready to land.Sep 5 2021, 19:54

rebase

Harbormaster completed remote builds in B16557: Diff 29796.Sep 6 2021, 13:11

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  | 35 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  | 8 s
[0m[0;32mwallet_address_types.py                 | ✓ Passed  | 14 s
[0m[0;32mwallet_avoidreuse.py                    | ✓ Passed  | 3 s
[0m[0;32mwallet_backup.py                        | ✓ Passed  | 27 s
[0m[0;32mwallet_balance.py                       | ✓ Passed  | 13 s
[0m[0;32mwallet_basic.py                         | ✓ Passed  | 28 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  | 9 s
[0m[0;32mwallet_disable.py                       | ✓ Passed  | 0 s
[0m[0;32mwallet_dump.py                          | ✓ Passed  | 4 s
[0m[0;32mwallet_encryption.py                    | ✓ Passed  | 5 s
[0m[0;32mwallet_hd.py                            | ✓ Passed  | 6 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  | 4 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  | 2 s
[0m[0;32mwallet_labels.py                        | ✓ Passed  | 1 s
[0m[0;32mwallet_listreceivedby.py                | ✓ Passed  | 23 s
[0m[0;32mwallet_listsinceblock.py                | ✓ Passed  | 3 s
[0m[0;32mwallet_listtransactions.py              | ✓ Passed  | 9 s
[0m[0;32mwallet_multiwallet.py                   | ✓ Passed  | 39 s
[0m[0;32mwallet_multiwallet.py --usecli          | ✓ Passed  | 16 s
[0m[0;32mwallet_reorgsrestore.py                 | ✓ Passed  | 3 s
[0m[0;32mwallet_resendwallettransactions.py      | ✓ Passed  | 6 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[0;32mwallet_zapwallettxes.py                 | ✓ Passed  | 3 s
[0m[1m
ALL                                     | ✓ Passed  | 995 s (accumulated) 
[0mRuntime: 199 s

----------------------------------------------------------------------
Ran 5 tests in 0.001s

OK

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

unable to reproduce CI failure, and it happened on a "blank" diff (rebase).
Try to rebase again, on latest master.

PiRK added a child revision: D10048: Introduce DummyDatabase and use it in the tests.Sep 6 2021, 14:27

Harbormaster completed remote builds in B16559: Diff 29798.Sep 6 2021, 14:36

Closed by commit rABC5cbb600772e0: walletdb: Remove BerkeleyBatch friend class from BerkeleyDatabase (authored by Andrew Chow <achow101-github@achow101.com>, committed by PiRK). · Explain WhySep 6 2021, 16:04

This revision was automatically updated to reflect the committed changes.

PiRK added a commit: rABC5cbb600772e0: walletdb: Remove BerkeleyBatch friend class from BerkeleyDatabase.