diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-18 09:27:26 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-18 09:27:29 +0100 |
| commit | 52d6509497a717cb01154aa05aa2b69f99ed5391 (patch) | |
| tree | 0624de65deb24e0b05b8a99ea57ef1a125e7d897 /src | |
| parent | e6ff110820fb69cb4edecee78bad07cac0b7d88e (diff) | |
| parent | 87a08cba43f8dc427efccbd45d28acc652db2cb6 (diff) | |
Merge bitcoin/bitcoin#26904: build: move rpc/request from util lib to common
87a08cba43f8dc427efccbd45d28acc652db2cb6 build: move rpc/request from util lib to common (fanquake)
Pull request description:
This is JSON RPC related code that doesn't need to be in util, and should not be required by the kernel.
ACKs for top commit:
TheCharlatan:
ACK 87a08cba43f8dc427efccbd45d28acc652db2cb6
Tree-SHA512: 5f335be9f0f9ff02eff073af47558ecf505c1392c05f18ca24a065b12b8d92529ec3942d84978cc5028c38369c496ed0243653e1fa26d4db2fae26dfe55c3d65
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 62c94f59fb..35b0ad24c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -655,8 +655,9 @@ libbitcoin_common_a_SOURCES = \ policy/policy.cpp \ protocol.cpp \ psbt.cpp \ - rpc/rawtransaction_util.cpp \ rpc/external_signer.cpp \ + rpc/rawtransaction_util.cpp \ + rpc/request.cpp \ rpc/util.cpp \ scheduler.cpp \ script/descriptor.cpp \ @@ -684,7 +685,6 @@ libbitcoin_util_a_SOURCES = \ logging.cpp \ random.cpp \ randomenv.cpp \ - rpc/request.cpp \ support/cleanse.cpp \ sync.cpp \ util/asmap.cpp \ |