Skip to content

Commit 6092f89

Browse files
tchardingtcharding
committed
Rename bitcoind to node
In line with other recent renames change the `bitcoind` directory to be `node` (crate is already called `corepc-node`). And change the `BitcoinD` type to be called `Node`. This is in line with Bitcoin nomenclature.
1 parent c530901 commit 6092f89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+151
-152
lines changed

‎Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
members = ["client", "types", "jsonrpc"]
3-
exclude = ["integration_test", "bitcoind"]
3+
exclude = ["integration_test", "node"]
44
resolver = "2"
55

66
[patch.crates-io.corepc-client]
@@ -9,8 +9,5 @@ path = "client"
99
[patch.crates-io.corepc-types]
1010
path = "types"
1111

12-
[patch.crates-io.corepc-node]
13-
path = "bitcoind"
14-
1512
[patch.crates-io.jsonrpc]
1613
path = "jsonrpc"

‎client/src/client_sync/v17/blockchain.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `getbestblockhash`
12+
/// Implements Bitcoin Core JSON-RPC API method `getbestblockhash`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__getbestblockhash {
1515
() => {
@@ -27,7 +27,7 @@ macro_rules! impl_client_v17__getbestblockhash {
2727
};
2828
}
2929

30-
/// Implements bitcoind JSON-RPC API method `getblock`
30+
/// Implements Bitcoin Core JSON-RPC API method `getblock`
3131
#[macro_export]
3232
macro_rules! impl_client_v17__getblock {
3333
() => {
@@ -52,7 +52,7 @@ macro_rules! impl_client_v17__getblock {
5252
};
5353
}
5454

55-
/// Implements bitcoind JSON-RPC API method `getblockchaininfo`
55+
/// Implements Bitcoin Core JSON-RPC API method `getblockchaininfo`
5656
#[macro_export]
5757
macro_rules! impl_client_v17__getblockchaininfo {
5858
() => {
@@ -64,7 +64,7 @@ macro_rules! impl_client_v17__getblockchaininfo {
6464
};
6565
}
6666

67-
/// Implements bitcoind JSON-RPC API method `getblockcount`
67+
/// Implements Bitcoin Core JSON-RPC API method `getblockcount`
6868
#[macro_export]
6969
macro_rules! impl_client_v17__getblockcount {
7070
() => {
@@ -76,7 +76,7 @@ macro_rules! impl_client_v17__getblockcount {
7676
};
7777
}
7878

79-
/// Implements bitcoind JSON-RPC API method `getblockhash`
79+
/// Implements Bitcoin Core JSON-RPC API method `getblockhash`
8080
#[macro_export]
8181
macro_rules! impl_client_v17__getblockhash {
8282
() => {
@@ -88,7 +88,7 @@ macro_rules! impl_client_v17__getblockhash {
8888
};
8989
}
9090

91-
/// Implements bitcoind JSON-RPC API method `getblockheader`
91+
/// Implements Bitcoin Core JSON-RPC API method `getblockheader`
9292
#[macro_export]
9393
macro_rules! impl_client_v17__getblockheader {
9494
() => {
@@ -108,7 +108,7 @@ macro_rules! impl_client_v17__getblockheader {
108108
};
109109
}
110110

111-
/// Implements bitcoind JSON-RPC API method `getblockstats`
111+
/// Implements Bitcoin Core JSON-RPC API method `getblockstats`
112112
#[macro_export]
113113
macro_rules! impl_client_v17__getblockstats {
114114
() => {
@@ -124,7 +124,7 @@ macro_rules! impl_client_v17__getblockstats {
124124
};
125125
}
126126

127-
/// Implements bitcoind JSON-RPC API method `getchaintips`
127+
/// Implements Bitcoin Core JSON-RPC API method `getchaintips`
128128
#[macro_export]
129129
macro_rules! impl_client_v17__getchaintips {
130130
() => {
@@ -134,7 +134,7 @@ macro_rules! impl_client_v17__getchaintips {
134134
};
135135
}
136136

137-
/// Implements bitcoind JSON-RPC API method `getchaintxstats`
137+
/// Implements Bitcoin Core JSON-RPC API method `getchaintxstats`
138138
#[macro_export]
139139
macro_rules! impl_client_v17__getchaintxstats {
140140
() => {
@@ -146,7 +146,7 @@ macro_rules! impl_client_v17__getchaintxstats {
146146
};
147147
}
148148

149-
/// Implements bitcoind JSON-RPC API method `getdifficulty`
149+
/// Implements Bitcoin Core JSON-RPC API method `getdifficulty`
150150
#[macro_export]
151151
macro_rules! impl_client_v17__getdifficulty {
152152
() => {
@@ -158,7 +158,7 @@ macro_rules! impl_client_v17__getdifficulty {
158158
};
159159
}
160160

161-
/// Implements bitcoind JSON-RPC API method `getmempoolancestors`
161+
/// Implements Bitcoin Core JSON-RPC API method `getmempoolancestors`
162162
#[macro_export]
163163
macro_rules! impl_client_v17__getmempoolancestors {
164164
() => {
@@ -170,7 +170,7 @@ macro_rules! impl_client_v17__getmempoolancestors {
170170
};
171171
}
172172

173-
/// Implements bitcoind JSON-RPC API method `gettxout`
173+
/// Implements Bitcoin Core JSON-RPC API method `gettxout`
174174
#[macro_export]
175175
macro_rules! impl_client_v17__gettxout {
176176
() => {

‎client/src/client_sync/v17/control.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `getmemory`
12+
/// Implements Bitcoin Core JSON-RPC API method `getmemory`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__getmemoryinfo {
1515
() => {
@@ -21,7 +21,7 @@ macro_rules! impl_client_v17__getmemoryinfo {
2121
};
2222
}
2323

24-
/// Implements bitcoind JSON-RPC API method `logging`
24+
/// Implements Bitcoin Core JSON-RPC API method `logging`
2525
#[macro_export]
2626
macro_rules! impl_client_v17__logging {
2727
() => {
@@ -31,7 +31,7 @@ macro_rules! impl_client_v17__logging {
3131
};
3232
}
3333

34-
/// Implements bitcoind JSON-RPC API method `stop`
34+
/// Implements Bitcoin Core JSON-RPC API method `stop`
3535
#[macro_export]
3636
macro_rules! impl_client_v17__stop {
3737
() => {
@@ -41,7 +41,7 @@ macro_rules! impl_client_v17__stop {
4141
};
4242
}
4343

44-
/// Implements bitcoind JSON-RPC API method `uptime`
44+
/// Implements Bitcoin Core JSON-RPC API method `uptime`
4545
#[macro_export]
4646
macro_rules! impl_client_v17__uptime {
4747
() => {

‎client/src/client_sync/v17/generating.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `generatetoaddress`
12+
/// Implements Bitcoin Core JSON-RPC API method `generatetoaddress`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__generatetoaddress {
1515
() => {
@@ -25,7 +25,7 @@ macro_rules! impl_client_v17__generatetoaddress {
2525
};
2626
}
2727

28-
/// Implements bitcoind JSON-RPC API method `generate`
28+
/// Implements Bitcoin Core JSON-RPC API method `generate`
2929
#[macro_export]
3030
macro_rules! impl_client_v17__generate {
3131
() => {

‎client/src/client_sync/v17/network.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See, or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `getaddednodeinfo`
12+
/// Implements Bitcoin Core JSON-RPC API method `getaddednodeinfo`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__getaddednodeinfo {
1515
() => {
@@ -21,7 +21,7 @@ macro_rules! impl_client_v17__getaddednodeinfo {
2121
};
2222
}
2323

24-
/// Implements bitcoind JSON-RPC API method `getnettotals`
24+
/// Implements Bitcoin Core JSON-RPC API method `getnettotals`
2525
#[macro_export]
2626
macro_rules! impl_client_v17__getnettotals {
2727
() => {
@@ -31,7 +31,7 @@ macro_rules! impl_client_v17__getnettotals {
3131
};
3232
}
3333

34-
/// Implements bitcoind JSON-RPC API method `getnetworkinfo`
34+
/// Implements Bitcoin Core JSON-RPC API method `getnetworkinfo`
3535
#[macro_export]
3636
macro_rules! impl_client_v17__getnetworkinfo {
3737
() => {
@@ -49,7 +49,7 @@ macro_rules! impl_client_v17__getnetworkinfo {
4949
};
5050
}
5151

52-
/// Implements bitcoind JSON-RPC API method `getpeerinfo`
52+
/// Implements Bitcoin Core JSON-RPC API method `getpeerinfo`
5353
#[macro_export]
5454
macro_rules! impl_client_v17__getpeerinfo {
5555
() => {

‎client/src/client_sync/v17/raw_transactions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `sendrawtransaction`
12+
/// Implements Bitcoin Core JSON-RPC API method `sendrawtransaction`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__sendrawtransaction {
1515
() => {

‎client/src/client_sync/v17/wallet.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `createwallet`
12+
/// Implements Bitcoin Core JSON-RPC API method `createwallet`
1313
#[macro_export]
1414
macro_rules! impl_client_v17__createwallet {
1515
() => {
@@ -21,7 +21,7 @@ macro_rules! impl_client_v17__createwallet {
2121
};
2222
}
2323

24-
/// Implements bitcoind JSON-RPC API method `unloadwallet`
24+
/// Implements Bitcoin Core JSON-RPC API method `unloadwallet`
2525
#[macro_export]
2626
macro_rules! impl_client_v17__unloadwallet {
2727
() => {
@@ -33,7 +33,7 @@ macro_rules! impl_client_v17__unloadwallet {
3333
};
3434
}
3535

36-
/// Implements bitcoind JSON-RPC API method `loadwallet`
36+
/// Implements Bitcoin Core JSON-RPC API method `loadwallet`
3737
#[macro_export]
3838
macro_rules! impl_client_v17__loadwallet {
3939
() => {
@@ -45,7 +45,7 @@ macro_rules! impl_client_v17__loadwallet {
4545
};
4646
}
4747

48-
/// Implements bitcoind JSON-RPC API method `getbalance`
48+
/// Implements Bitcoin Core JSON-RPC API method `getbalance`
4949
#[macro_export]
5050
macro_rules! impl_client_v17__getbalance {
5151
() => {
@@ -55,7 +55,7 @@ macro_rules! impl_client_v17__getbalance {
5555
};
5656
}
5757

58-
/// Implements bitcoind JSON-RPC API method `getnewaddress`
58+
/// Implements Bitcoin Core JSON-RPC API method `getnewaddress`
5959
#[macro_export]
6060
macro_rules! impl_client_v17__getnewaddress {
6161
() => {
@@ -93,7 +93,7 @@ macro_rules! impl_client_v17__getnewaddress {
9393
};
9494
}
9595

96-
/// Implements bitcoind JSON-RPC API method `sendtoaddress`
96+
/// Implements Bitcoin Core JSON-RPC API method `sendtoaddress`
9797
#[macro_export]
9898
macro_rules! impl_client_v17__sendtoaddress {
9999
() => {
@@ -110,7 +110,7 @@ macro_rules! impl_client_v17__sendtoaddress {
110110
};
111111
}
112112

113-
/// Implements bitcoind JSON-RPC API method `gettransaction`
113+
/// Implements Bitcoin Core JSON-RPC API method `gettransaction`
114114
#[macro_export]
115115
macro_rules! impl_client_v17__gettransaction {
116116
() => {

‎client/src/client_sync/v19/wallet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `getbalances`
12+
/// Implements Bitcoin Core JSON-RPC API method `getbalances`
1313
#[macro_export]
1414
macro_rules! impl_client_v19__getbalances {
1515
() => {

‎client/src/client_sync/v22/wallet.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//!
1010
//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
1111
12-
/// Implements bitcoind JSON-RPC API method `unloadwallet`
12+
/// Implements Bitcoin Core JSON-RPC API method `unloadwallet`
1313
#[macro_export]
1414
macro_rules! impl_client_v22__unloadwallet {
1515
() => {
@@ -21,7 +21,7 @@ macro_rules! impl_client_v22__unloadwallet {
2121
};
2222
}
2323

24-
/// Implements bitcoind JSON-RPC API method `loadwallet`
24+
/// Implements Bitcoin Core JSON-RPC API method `loadwallet`
2525
#[macro_export]
2626
macro_rules! impl_client_v22__loadwallet {
2727
() => {

‎integration_test/Cargo.toml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ edition = "2021"
1111
# - `cargo test --all-features` is the same as `cargo test --features=v26_2`
1212
# - `cargo test --no-default-features` skips all tests.
1313
[features]
14-
# Enable the same feature in `bitcoind` and the version feature here.
14+
# Enable the same feature in `node` and the version feature here.
1515
# All minor releases (but only the latest patch release).
16-
"28_0" = ["v28", "bitcoind/28_0"]
17-
"27_1" = ["v27", "bitcoind/27_1"]
18-
"27_0" = ["v27", "bitcoind/27_0"]
19-
"26_2" = ["v26", "bitcoind/26_2"]
20-
"26_1" = ["v26", "bitcoind/26_1"]
21-
"26_0" = ["v26", "bitcoind/26_0"]
22-
"25_2" = ["v25", "bitcoind/25_2"]
23-
"25_1" = ["v25", "bitcoind/25_1"]
24-
"25_0" = ["v25", "bitcoind/25_0"]
25-
"24_2" = ["v24", "bitcoind/24_2"]
26-
"24_1" = ["v24", "bitcoind/24_1"]
27-
"24_0_1" = ["v24", "bitcoind/24_0_1"]
28-
"23_2" = ["v23", "bitcoind/23_2"]
29-
"23_1" = ["v23", "bitcoind/23_1"]
30-
"23_0" = ["v23", "bitcoind/23_0"]
31-
"22_1" = ["v22", "bitcoind/22_1"]
32-
"22_0" = ["v22", "bitcoind/22_0"]
16+
"28_0" = ["v28", "node/28_0"]
17+
"27_1" = ["v27", "node/27_1"]
18+
"27_0" = ["v27", "node/27_0"]
19+
"26_2" = ["v26", "node/26_2"]
20+
"26_1" = ["v26", "node/26_1"]
21+
"26_0" = ["v26", "node/26_0"]
22+
"25_2" = ["v25", "node/25_2"]
23+
"25_1" = ["v25", "node/25_1"]
24+
"25_0" = ["v25", "node/25_0"]
25+
"24_2" = ["v24", "node/24_2"]
26+
"24_1" = ["v24", "node/24_1"]
27+
"24_0_1" = ["v24", "node/24_0_1"]
28+
"23_2" = ["v23", "node/23_2"]
29+
"23_1" = ["v23", "node/23_1"]
30+
"23_0" = ["v23", "node/23_0"]
31+
"22_1" = ["v22", "node/22_1"]
32+
"22_0" = ["v22", "node/22_0"]
3333
# Only the latest minor version for these.
34-
"0_21_2" = ["v21", "bitcoind/0_21_2"]
35-
"0_20_2" = ["v20", "bitcoind/0_20_2"]
36-
"0_19_1" = ["v19", "bitcoind/0_19_1"]
37-
"0_18_1" = ["v18", "bitcoind/0_18_1"]
38-
"0_17_1" = ["v17", "bitcoind/0_17_1"]
34+
"0_21_2" = ["v21", "node/0_21_2"]
35+
"0_20_2" = ["v20", "node/0_20_2"]
36+
"0_19_1" = ["v19", "node/0_19_1"]
37+
"0_18_1" = ["v18", "node/0_18_1"]
38+
"0_17_1" = ["v17", "node/0_17_1"]
3939

4040
# Each minor version is tested with the same client.
4141
"v28" = []
@@ -54,7 +54,7 @@ edition = "2021"
5454
[dependencies]
5555
bitcoin = { version = "0.32.0", default-features = false, features = ["std", "serde"] }
5656
client = { package = "corepc-client", version = "0.4.0", default-features = false, features = ["client-sync"] }
57-
bitcoind = { package = "corepc-node", version = "0.4.0", default-features = false, features = [] }
57+
node = { package = "corepc-node", version = "0.4.0", default-features = false, features = [] }
5858
rand = "0.8.5"
5959
env_logger = "0.9.0"
6060

@@ -67,4 +67,4 @@ path = "../client"
6767
path = "../types"
6868

6969
[patch.crates-io.corepc-node]
70-
path = "../bitcoind"
70+
path = "../node"

0 commit comments

Comments
 (0)