Skip to content

Commit 24e4857

Browse files
author
MarcoFalke
committed
Merge #20494: refactor: Move node and wallet code out of src/interfaces
629a929 Move WalletImpl from interfaces/wallet.cpp to wallet/interfaces.cpp (Russell Yanofsky) 2a26771 Move ChainImpl from interfaces/chain.cpp to node/interfaces.cpp (Russell Yanofsky) 12bd0fc Move NodeImpl from interfaces/node.cpp to node/interfaces.cpp (Russell Yanofsky) Pull request description: This PR is part of the [process separation project](https://github.com/bitcoin/bitcoin/projects/10). --- Move `NodeImpl` from `interfaces/node.cpp` to `node/interfaces.cpp` Move `ChainImpl` from `interfaces/chain.cpp` to `node/interfaces.cpp` Move `WalletImpl` from `interfaces/wallet.cpp` to `wallet/interfaces.cpp` No changes to any classes (can review with `git diff --color-moved=dimmed_zebra`) Motivation for this change is to move node and wallet code to respective directories where it might fit in better than `src/interfaces/`, but also to remove all unnecessary code from `src/interfaces/` to unblock #19160 review, which has been hung up partially because of code organization. Building on top of this PR, #19160 should now be able to organize interface implementations more understandably in `src/node/` `src/wallet/` `src/ipc/` and `src/init/` directories instead of having so much functionality all in `src/interfaces/` ACKs for top commit: promag: Code review ACK 629a929. MarcoFalke: review ACK 629a929 🔺 Tree-SHA512: 87c2b8fd51519bbd4e5ad3539a79debcf88c3bf021eb28c63f3f555186538b62a0c4cc1a3f07cfb4ff13aea8b0b2fdde505d81f22a5e5fd12a6e375b55a92ab8
2 parents ffd5e7a + 629a929 commit 24e4857

File tree

4 files changed

+302
-317
lines changed

4 files changed

+302
-317
lines changed

src/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,13 @@ libbitcoin_server_a_SOURCES = \
298298
index/blockfilterindex.cpp \
299299
index/txindex.cpp \
300300
init.cpp \
301-
interfaces/chain.cpp \
302-
interfaces/node.cpp \
303301
miner.cpp \
304302
net.cpp \
305303
net_processing.cpp \
306304
node/coin.cpp \
307305
node/coinstats.cpp \
308306
node/context.cpp \
307+
node/interfaces.cpp \
309308
node/psbt.cpp \
310309
node/transaction.cpp \
311310
node/ui_interface.cpp \
@@ -358,13 +357,13 @@ endif
358357
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(SQLITE_CFLAGS)
359358
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
360359
libbitcoin_wallet_a_SOURCES = \
361-
interfaces/wallet.cpp \
362360
wallet/coincontrol.cpp \
363361
wallet/context.cpp \
364362
wallet/crypter.cpp \
365363
wallet/db.cpp \
366364
wallet/feebumper.cpp \
367365
wallet/fees.cpp \
366+
wallet/interfaces.cpp \
368367
wallet/load.cpp \
369368
wallet/rpcdump.cpp \
370369
wallet/rpcwallet.cpp \

src/interfaces/node.cpp

Lines changed: 0 additions & 303 deletions
This file was deleted.

0 commit comments

Comments
 (0)