Merge pull request #83 from tcharding/03-10-getblockstats

Refactor `getblockstats` tests and enable for v18

Author: tcharding

integration_test/src/lib.rs

@@ -25,6 +25,13 @@ pub trait NodeExt {
         Self::new(conf, None)
     }
 
+    /// Returns a handle to a `bitcoind` instance with "default" wallet loaded and `-txindex` enabled.
+    fn new_with_default_wallet_txindex() -> Node {
+        let mut conf = node::Conf::default();
+        conf.args.push("-txindex");
+        Self::new(conf, None)
+    }
+
     /// Returns a handle to a `bitcoind` instance with `wallet` loaded.
     fn new_with_wallet(wallet: String) -> Node {
         let conf = node::Conf::default();

integration_test/tests/blockchain.rs

@@ -70,55 +70,41 @@ fn get_block_header_verbose() { // verbose = true
     assert!(json.into_model().is_ok());
 }
 
-#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
+#[cfg(not(any(feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
 // `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
 // (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
 // allowing to.
 #[test]
 fn get_block_stats() {
-    get_block_stats_by_height();
-    get_block_stats_by_hash();
+    // Version 18 cannot getblockstats if -txindex is not enabled.
+    #[cfg(not(feature = "v18"))]
+    getblockstats();
+
+    // All non-feature gated versions including 18 can getblockstats if -txindex is enabled.
+    getblockstats_txindex();
 }
 
 #[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
-// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
-// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
-// allowing to.
-fn get_block_stats_by_height() {
-    let node = Node::new_no_wallet();
-    let json = node.client.get_block_stats_by_height(0).expect("getblockstats");
+fn getblockstats() {
+    let node = Node::new_with_default_wallet();
+    node.mine_a_block();
+
+    let json = node.client.get_block_stats_by_height(1).expect("getblockstats");
     assert!(json.into_model().is_ok());
-}
 
-#[cfg(not(any(feature = "v18", feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
-// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
-// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
-// allowing to.
-fn get_block_stats_by_hash() { // verbose = true
-    let node = Node::new_no_wallet();
     let block_hash = best_block_hash();
     let json = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
     assert!(json.into_model().is_ok());
 }
 
 #[cfg(not(any(feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
-// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
-// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
-// allowing to.
-#[test]
-fn get_block_stats_by_height_txindex() {
-    let node = Node::new_no_wallet_txindex();
-    let json = node.client.get_block_stats_by_height(0).expect("getblockstats");
+fn getblockstats_txindex() {
+    let node = Node::new_with_default_wallet_txindex();
+    node.mine_a_block();
+
+    let json = node.client.get_block_stats_by_height(1).expect("getblockstats");
     assert!(json.into_model().is_ok());
-}
 
-#[cfg(not(any(feature = "v19", feature = "v20", feature = "v21", feature = "v22", feature = "v23", feature = "v24")))]
-// `getblockstats` used to not work on the genesis block as it doesn't have undo data saved to disk
-// (see https://github.com/bitcoin/bitcoin/pull/19888). We therefore only run tests for versions
-// allowing to.
-#[test]
-fn get_block_stats_by_hash_txindex() { // verbose = true
-    let node = Node::new_no_wallet_txindex();
     let block_hash = best_block_hash();
     let json = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
     assert!(json.into_model().is_ok());

types/src/v18/mod.rs

@@ -28,7 +28,7 @@
 //! | getblockcount                      | done            |
 //! | getblockhash                       | done            |
 //! | getblockheader                     | done            |
-//! | getblockstats                      | done (untested) |
+//! | getblockstats                      | done            |
 //! | getchaintips                       | done            |
 //! | getchaintxstats                    | done            |
 //! | getdifficulty                      | done            |