Skip to content

Commit fa3fb46

Browse files
committed
Merge bitcoin/bitcoin#23667: Split up rpcwallet
b36e738 MOVEONLY: Move abortrescan from backup.cpp to transactions.cpp (Samuel Dobson) d794d0d Remove unused imports from rpc/wallet and reorder RPCs (Samuel Dobson) e116b97 MOVEONLY: Move rpcwallet to rpc/wallet (Samuel Dobson) 8e30875 MOVEONLY: Move spending RPCs to spend.cpp (Samuel Dobson) 9ce521a MOVEONLY: Move balance and utxo RPCs to coins.cpp (Samuel Dobson) 7b45f5c MOVEONLY: Move address related functions from rpcwallet to addresses.cpp (Samuel Dobson) f7646b4 MOVEONLY: Move transaction related wallet RPCs to transactions.cpp (Samuel Dobson) Pull request description: This is the rest of #23622, to split up rpcwallet into smaller, more logical parts. This will have a lot of conflicts but let's just get it over and done with. ACKs for top commit: achow101: ACK b36e738 ryanofsky: Code review ACK b36e738, verified move-only again Tree-SHA512: 6695fa23bbe9822c7497db7660f44c3dcb01dfa7276f5830a6b7c73c6b5fa04e04fcd4821bf0e6392e7659ed91a277ced85bd8f77477d785bca4e84a93fe791e
2 parents 0d10105 + b36e738 commit fa3fb46

File tree

10 files changed

+4582
-4496
lines changed

10 files changed

+4582
-4496
lines changed

src/Makefile.am

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ BITCOIN_CORE_H = \
282282
wallet/ismine.h \
283283
wallet/load.h \
284284
wallet/receive.h \
285-
wallet/rpcwallet.h \
286285
wallet/rpc/util.h \
286+
wallet/rpc/wallet.h \
287287
wallet/salvage.h \
288288
wallet/scriptpubkeyman.h \
289289
wallet/spend.h \
@@ -410,11 +410,15 @@ libbitcoin_wallet_a_SOURCES = \
410410
wallet/interfaces.cpp \
411411
wallet/load.cpp \
412412
wallet/receive.cpp \
413+
wallet/rpc/addresses.cpp \
413414
wallet/rpc/backup.cpp \
415+
wallet/rpc/coins.cpp \
414416
wallet/rpc/encrypt.cpp \
417+
wallet/rpc/spend.cpp \
415418
wallet/rpc/signmessage.cpp \
419+
wallet/rpc/transactions.cpp \
416420
wallet/rpc/util.cpp \
417-
wallet/rpcwallet.cpp \
421+
wallet/rpc/wallet.cpp \
418422
wallet/scriptpubkeyman.cpp \
419423
wallet/spend.cpp \
420424
wallet/transaction.cpp \

src/wallet/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <wallet/ismine.h>
2525
#include <wallet/load.h>
2626
#include <wallet/receive.h>
27-
#include <wallet/rpcwallet.h>
27+
#include <wallet/rpc/wallet.h>
2828
#include <wallet/spend.h>
2929
#include <wallet/wallet.h>
3030

0 commit comments

Comments
 (0)