aboutsummaryrefslogtreecommitdiff
path: root/test/lint
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2021-02-10 16:06:01 -0500
committerRussell Yanofsky <russ@yanofsky.org>2021-05-26 06:32:51 -0500
commitc7bd5842e467c4fc286399379572bbdec6b26a4f (patch)
treeabe503bdb5da1d724f57ac95919409c8d74528ac /test/lint
parentecddd1248258fb904ba88b5255ecbc624eec4f37 (diff)
downloadbitcoin-c7bd5842e467c4fc286399379572bbdec6b26a4f.tar.xz
MOVEONLY: CWallet transaction code out of wallet.cpp/.h
This commit just moves functions without making any changes. It can be reviewed with `git log -p -n1 --color-moved=dimmed_zebra` Motivation for this change is to make wallet.cpp/h less monolithic and start to make wallet transaction state tracking comprehensible so bugs in https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Transaction-Conflict-Tracking can be fixed safely without introducing new problems. This commit moves wallet classes and methods that deal with transactions out of wallet.cpp/.h into better organized files: - transaction.cpp/.h - CWalletTx and CMerkleTx class definitions - receive.cpp/.h - functions checking received transactions and computing balances - spend.cpp/.h - functions creating transactions and finding spendable coins After #20773, when loading is separated from syncing it will also be possible to move more wallet.cpp/.h functions to: - sync.cpp/.h - functions handling chain notifications and rescanning This commit arranges receive.cpp and spend.cpp functions in dependency order so it's possible to skim receive.cpp and get an idea of how computing balances works, and skim spend.cpp and get an idea of how transactions are created, without having to jump all over wallet.cpp where functions are not in order and there is a lot of unrelated code. Followup commit "refactor: Detach wallet transaction methods" in https://github.com/bitcoin/bitcoin/pull/21206 follows up this PR and tweaks function names and arguments to reflect new locations. The two commits are split into separate PRs because this commit is more work to maintain and less work to review, while the other commit is less work to maintain and more work to review, so hopefully this commit can be merged earlier.
Diffstat (limited to 'test/lint')
-rwxr-xr-xtest/lint/lint-circular-dependencies.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
index 354e14f361..07d613f62d 100755
--- a/test/lint/lint-circular-dependencies.sh
+++ b/test/lint/lint-circular-dependencies.sh
@@ -25,6 +25,10 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"wallet/fees -> wallet/wallet -> wallet/fees"
"wallet/wallet -> wallet/walletdb -> wallet/wallet"
"node/coinstats -> validation -> node/coinstats"
+ # Temporary circular dependencies that allow wallet.h/wallet.cpp to be
+ # split up in a MOVEONLY commit. These are removed in #21206.
+ "wallet/receive -> wallet/wallet -> wallet/receive"
+ "wallet/spend -> wallet/wallet -> wallet/spend"
)
EXIT_CODE=0