Add getblockfrompeer macro and test

The types table said version + model but an empty json object is
returned.

Update the table to `returns nothing`.

Add a client macro that returns `Ok` if an empty json object is
returned.

Add a test where the RPC succeeds and returns an empty object.

Author: jamillambert

client/src/client_sync/v23/blockchain.rs

@@ -9,6 +9,22 @@
 //!
 //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
+/// Implements Bitcoin Core JSON-RPC API method `getblockfrompeer`
+#[macro_export]
+macro_rules! impl_client_v23__get_block_from_peer {
+    () => {
+        impl Client {
+            pub fn get_block_from_peer(&self, blockhash: BlockHash, peer_id: u32) -> Result<()> {
+                match self.call("getblockfrompeer", &[into_json(blockhash)?, into_json(peer_id)?]) {
+                    Ok(serde_json::Value::Object(ref map)) if map.is_empty() => Ok(()),
+                    Ok(res) => Err(Error::Returned(res.to_string())),
+                    Err(err) => Err(err.into()),
+                }
+            }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `savemempool`
 #[macro_export]
 macro_rules! impl_client_v23__save_mempool {

client/src/client_sync/v23/mod.rs

@@ -35,6 +35,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v24/mod.rs

@@ -32,6 +32,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v25/mod.rs

@@ -34,6 +34,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v26/mod.rs

@@ -36,6 +36,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v27/mod.rs

@@ -32,6 +32,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v28/mod.rs

@@ -34,6 +34,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

client/src/client_sync/v29/mod.rs

@@ -33,6 +33,7 @@ crate::impl_client_v17__get_block!();
 crate::impl_client_v17__get_blockchain_info!();
 crate::impl_client_v17__get_block_count!();
 crate::impl_client_v19__get_block_filter!();
+crate::impl_client_v23__get_block_from_peer!();
 crate::impl_client_v17__get_block_hash!();
 crate::impl_client_v17__get_block_header!();
 crate::impl_client_v17__get_block_stats!();

integration_test/tests/blockchain.rs

@@ -65,6 +65,37 @@ fn blockchain__get_block_filter__modelled() {
     model.unwrap();
 }
 
+#[test]
+#[cfg(not(feature = "v22_and_below"))]
+fn blockchain__get_block_from_peer() {
+    use bitcoin::hashes::Hash;
+    let (node1, _node2, _node3) = integration_test::three_node_network();
+
+    let now = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .expect("Time went backwards")
+        .as_secs() as u32;
+
+    // Create a dummy header and submit it
+    let mut header = bitcoin::block::Header {
+        version: bitcoin::block::Version::from_consensus(0x20000000),
+        prev_blockhash: node1.client.best_block_hash().expect("best_block_hash failed"),
+        merkle_root: bitcoin::TxMerkleNode::all_zeros(),
+        time: now,
+        bits: bitcoin::CompactTarget::from_consensus(0x207fffff),
+        nonce: 0,
+    };
+    let target = header.target();
+    while header.validate_pow(target).is_err() {
+        header.nonce += 1;
+    }
+    node1.client.submit_header(&header).expect("submit_header failed");
+
+    let hash = header.block_hash();
+    let peer_id = node1.client.get_peer_info().expect("getpeerinfo").0[0].id;
+    let _: () = node1.client.get_block_from_peer(hash, peer_id).expect("getblockfrompeer");
+}
+
 #[test]
 fn blockchain__get_block_hash__modelled() {
     let node = Node::with_wallet(Wallet::None, &[]);

types/src/v23/mod.rs

@@ -31,7 +31,7 @@
 //! | getblockchaininfo                  | version + model |                                        |
 //! | getblockcount                      | version + model |                                        |
 //! | getblockfilter                     | version         |                                        |
-//! | getblockfrompeer                   | version + model | TODO                                   |
+//! | getblockfrompeer                   | returns nothing |                                        |
 //! | getblockhash                       | version + model |                                        |
 //! | getblockheader                     | version + model | Includes additional 'verbose' type     |
 //! | getblockstats                      | version + model |                                        |