Skip to content

Commit 08e23fa

Browse files
committed
Merge rust-bitcoin#223: Fix naming inconsistency
16114ea fix:rename invalidateblock to invalidate_block for naming consistency (oyindamola oladapo) Pull request description: ### Fix missing underscore in `invalidate_block` client macro name This PR addresses the inconsistent naming in the client macro for the `invalidateblock` RPC method. When we updated client macro names to use underscores, `invalidateblock` was missed, likely because it was missing from the Method list due to being undocumented in the Core docs. Closes rust-bitcoin#215 ACKs for top commit: tcharding: ACK 16114ea Tree-SHA512: 4ae445f5f995914dc7901e4e502c40d45c295da361718e1fa645a508ba9166b3caa1bec06af1561f151f6110113c19aac3a09ce071d1621604b20745c3de523a
2 parents a6841a9 + 16114ea commit 08e23fa

File tree

14 files changed

+14
-14
lines changed

14 files changed

+14
-14
lines changed

client/src/client_sync/v17/generating.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ macro_rules! impl_client_v17__generate {
4040
/// Implements Bitcoin Core JSON-RPC API method `invalidateblock`
4141
// This method does not appear in the output of `bitcoin-cli help`.
4242
#[macro_export]
43-
macro_rules! impl_client_v17__invalidateblock {
43+
macro_rules! impl_client_v17__invalidate_block {
4444
() => {
4545
impl Client {
4646
pub fn invalidate_block(&self, hash: BlockHash) -> Result<()> {

client/src/client_sync/v17/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ crate::impl_client_v17__uptime!();
6161
// == Generating ==
6262
crate::impl_client_v17__generate_to_address!();
6363
crate::impl_client_v17__generate!();
64-
crate::impl_client_v17__invalidateblock!();
64+
crate::impl_client_v17__invalidate_block!();
6565

6666
// == Mining ==
6767
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v18/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ crate::impl_client_v17__uptime!();
6565
// == Generating ==
6666
crate::impl_client_v17__generate_to_address!();
6767
crate::impl_client_v17__generate!();
68-
crate::impl_client_v17__invalidateblock!();
68+
crate::impl_client_v17__invalidate_block!();
6969

7070
// == Mining ==
7171
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v19/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ crate::impl_client_v17__uptime!();
6363

6464
// == Generating ==
6565
crate::impl_client_v17__generate_to_address!();
66-
crate::impl_client_v17__invalidateblock!();
66+
crate::impl_client_v17__invalidate_block!();
6767

6868
// == Mining ==
6969
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v20/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ crate::impl_client_v17__uptime!();
6060

6161
// == Generating ==
6262
crate::impl_client_v17__generate_to_address!();
63-
crate::impl_client_v17__invalidateblock!();
63+
crate::impl_client_v17__invalidate_block!();
6464

6565
// == Mining ==
6666
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v21/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ crate::impl_client_v17__uptime!();
6262

6363
// == Generating ==
6464
crate::impl_client_v17__generate_to_address!();
65-
crate::impl_client_v17__invalidateblock!();
65+
crate::impl_client_v17__invalidate_block!();
6666

6767
// == Mining ==
6868
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v22/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ crate::impl_client_v17__uptime!();
6262

6363
// == Generating ==
6464
crate::impl_client_v17__generate_to_address!();
65-
crate::impl_client_v17__invalidateblock!();
65+
crate::impl_client_v17__invalidate_block!();
6666

6767
// == Mining ==
6868
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v23/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ crate::impl_client_v17__uptime!();
6464

6565
// == Generating ==
6666
crate::impl_client_v17__generate_to_address!();
67-
crate::impl_client_v17__invalidateblock!();
67+
crate::impl_client_v17__invalidate_block!();
6868

6969
// == Mining ==
7070
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v24/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ crate::impl_client_v17__uptime!();
6161

6262
// == Generating ==
6363
crate::impl_client_v17__generate_to_address!();
64-
crate::impl_client_v17__invalidateblock!();
64+
crate::impl_client_v17__invalidate_block!();
6565

6666
// == Mining ==
6767
crate::impl_client_v17__get_block_template!();

client/src/client_sync/v25/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ crate::impl_client_v17__uptime!();
6161

6262
// == Generating ==
6363
crate::impl_client_v17__generate_to_address!();
64-
crate::impl_client_v17__invalidateblock!();
64+
crate::impl_client_v17__invalidate_block!();
6565

6666
// == Mining ==
6767
crate::impl_client_v17__get_block_template!();

0 commit comments

Comments
 (0)