Merge pull request #107 from tcharding/03-19-hack

Just for fun

Author: tcharding

integration_test/tests/generating.rs

@@ -4,6 +4,16 @@
 
 use integration_test::{Node, NodeExt as _, Wallet};
 
+#[test]
+// The `generate` method deprecated in Core v18 and was removed in v19.
+#[cfg(feature = "v17")]
+fn generate() {
+    const NBLOCKS: usize = 10;
+
+    let node = Node::with_wallet(Wallet::Default, &[]);
+    let _ = node.client.generate(NBLOCKS).expect("generate");
+}
+
 #[test]
 fn generate_to_address() {
     const NBLOCKS: usize = 1;

types/src/model/blockchain.rs

@@ -408,20 +408,15 @@ pub struct MempoolEntry {
 pub struct MempoolEntryFees {
     /// Transaction fee in BTC.
     pub base: Amount,
-    /// Transaction fee with fee deltas used for mining priority in BTC.
+    /// Transaction fee with fee deltas used for mining priority.
     pub modified: Amount,
-    /// Modified fees (see above) of in-mempool ancestors (including this one) in BTC
+    /// Modified fees (see above) of in-mempool ancestors (including this one).
     pub ancestor: Amount,
-    /// Modified fees (see above) of in-mempool descendants (including this one) in BTC.
+    /// Modified fees (see above) of in-mempool descendants (including this one).
     pub descendant: Amount,
 }
 
-/// Models the result of JSON-RPC method `getmempooldescendants` with verbose set to true.
-/// Result of JSON-RPC method `getmempoolinfo` with verbose set to true
-///
-/// > getmempoolinfo
-/// >
-/// > Returns details on the active state of the TX memory pool.
+/// Models the result of JSON-RPC method `getmempoolinfo` with verbose set to true.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct GetMempoolInfo {
     /// Current transaction count.

types/src/v17/blockchain/error.rs

@@ -38,7 +38,7 @@ impl fmt::Display for GetBlockVerbosityOneError {
             Hash(ref e) => write_err!(f, "conversion of the `hash` field failed"; e),
             Tx(ref e) => write_err!(f, "conversion of the `tx` field failed"; e),
             Bits(ref e) => write_err!(f, "conversion of the `bits` field failed"; e),
-            ChainWork(ref e) => write_err!(f, "conversion of the `chain_ork` field failed"; e),
+            ChainWork(ref e) => write_err!(f, "conversion of the `chain_work` field failed"; e),
             PreviousBlockHash(ref e) =>
                 write_err!(f, "conversion of the `previous_block_hash` field failed"; e),
             NextBlockHash(ref e) =>
@@ -172,7 +172,7 @@ impl fmt::Display for GetBlockHeaderVerboseError {
             Numeric(ref e) => write_err!(f, "numeric"; e),
             Hash(ref e) => write_err!(f, "conversion of the `hash` field failed"; e),
             MerkleRoot(ref e) => write_err!(f, "conversion of the `merkle_root` field failed"; e),
-            Bits(ref e) => write_err!(f, "conversion of the `bit` field failed"; e),
+            Bits(ref e) => write_err!(f, "conversion of the `bits` field failed"; e),
             ChainWork(ref e) => write_err!(f, "conversion of the `chain_work` field failed"; e),
             PreviousBlockHash(ref e) =>
                 write_err!(f, "conversion of the `previous_bock_hash` field failed"; e),
@@ -344,7 +344,7 @@ impl std::error::Error for MapMempoolEntryError {
     }
 }
 
-/// Error when converting a `Mem` type into the model type.
+/// Error when converting a `MempoolEntry` type into the model type.
 #[derive(Debug)]
 pub enum MempoolEntryError {
     /// Conversion of numeric type to expected type failed.
@@ -392,15 +392,15 @@ impl std::error::Error for MempoolEntryError {
     }
 }
 
-/// Error when converting a `MempoolEntryFeesError` type into the model type.
+/// Error when converting a `MempoolEntryFees` type into the model type.
 #[derive(Debug)]
 pub enum MempoolEntryFeesError {
     /// Conversion of the `base` field failed.
     Base(ParseAmountError),
     /// Conversion of the `modified` field failed.
     Modified(ParseAmountError),
     /// Conversion of the `ancestor` field failed.
-    MempoolEntry(ParseAmountError),
+    Ancestor(ParseAmountError),
     /// Conversion of the `descendant` field failed.
     Descendant(ParseAmountError),
 }
@@ -412,7 +412,7 @@ impl fmt::Display for MempoolEntryFeesError {
         match *self {
             E::Base(ref e) => write_err!(f, "conversion of the `base` field failed"; e),
             E::Modified(ref e) => write_err!(f, "conversion of the `modified` field failed"; e),
-            E::MempoolEntry(ref e) => write_err!(f, "conversion of the `ancestor` field failed"; e),
+            E::Ancestor(ref e) => write_err!(f, "conversion of the `ancestor` field failed"; e),
             E::Descendant(ref e) => write_err!(f, "conversion of the `descendant` field failed"; e),
         }
     }
@@ -426,7 +426,7 @@ impl std::error::Error for MempoolEntryFeesError {
         match *self {
             E::Base(ref e) => Some(e),
             E::Modified(ref e) => Some(e),
-            E::MempoolEntry(ref e) => Some(e),
+            E::Ancestor(ref e) => Some(e),
             E::Descendant(ref e) => Some(e),
         }
     }
@@ -521,7 +521,7 @@ impl From<NumericError> for GetTxOutError {
     fn from(e: NumericError) -> Self { Self::Numeric(e) }
 }
 
-/// Error when converting a `GetTxOut` type into the model type.
+/// Error when converting a `GetTxOutSetInfo` type into the model type.
 #[derive(Debug)]
 pub enum GetTxOutSetInfoError {
     /// Conversion of numeric type to expected type failed.
@@ -538,7 +538,7 @@ impl fmt::Display for GetTxOutSetInfoError {
 
         match *self {
             Numeric(ref e) => write_err!(f, "numeric"; e),
-            BestBlock(ref e) => write_err!(f, "conversion of the `beast_block` field failed"; e),
+            BestBlock(ref e) => write_err!(f, "conversion of the `best_block` field failed"; e),
             TotalAmount(ref e) => write_err!(f, "conversion of the `total_amount` field failed"; e),
         }
     }

types/src/v17/blockchain/into.rs

@@ -372,6 +372,13 @@ impl GetMempoolDescendantsVerbose {
     }
 }
 
+impl GetMempoolEntry {
+    /// Converts version specific type to a version nonspecific, more strongly typed type.
+    pub fn into_model(self) -> Result<model::GetMempoolEntry, MempoolEntryError> {
+        Ok(model::GetMempoolEntry(self.0.into_model()?))
+    }
+}
+
 impl MempoolEntry {
     /// Converts version specific type to a version nonspecific, more strongly typed type.
     pub fn into_model(self) -> Result<model::MempoolEntry, MempoolEntryError> {
@@ -425,7 +432,7 @@ impl MempoolEntryFees {
         Ok(model::MempoolEntryFees {
             base: Amount::from_btc(self.base).map_err(E::Base)?,
             modified: Amount::from_btc(self.modified).map_err(E::Modified)?,
-            ancestor: Amount::from_btc(self.ancestor).map_err(E::MempoolEntry)?,
+            ancestor: Amount::from_btc(self.ancestor).map_err(E::Ancestor)?,
             descendant: Amount::from_btc(self.descendant).map_err(E::Descendant)?,
         })
     }

types/src/v17/blockchain/mod.rs

@@ -27,10 +27,21 @@ pub struct GetBestBlockHash(pub String);
 
 /// Result of JSON-RPC method `getblock` with verbosity set to 0.
 ///
-/// A string that is serialized, hex-encoded data for block 'hash'.
+/// > getblock "blockhash" ( verbosity )
+/// >
+/// > If verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.
+/// > If verbosity is 1, returns an Object with information about block `<hash>`.
+/// > If verbosity is 2, returns an Object with information about block `<hash>` and information about each transaction.
+/// >
+/// > Arguments:
+/// > 1. "blockhash"          (string, required) The block hash
+/// > 2. verbosity              (numeric, optional, default=1) 0 for hex encoded data, 1 for a json object, and 2 for json object with transaction data
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
 // TODO: Consider renaming this to `GetBlcokVerboseZero`.
-pub struct GetBlockVerbosityZero(pub String);
+pub struct GetBlockVerbosityZero(
+    /// A string that is serialized, hex-encoded data for block 'hash'.
+    pub String,
+);
 
 /// Result of JSON-RPC method `getblock` with verbosity set to 1.
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
@@ -85,8 +96,8 @@ pub struct GetBlockVerbosityOne {
 
 /// Result of JSON-RPC method `getblockchaininfo`.
 ///
-/// Method call: `getblockchaininfo`
-///
+/// > getblockchaininfo
+/// >
 /// > Returns an object containing various state info regarding blockchain processing.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct GetBlockchainInfo {
@@ -136,18 +147,18 @@ pub struct GetBlockchainInfo {
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct Softfork {
     /// Name of softfork.
-    id: String,
+    pub id: String,
     /// Block version.
-    version: i64,
+    pub version: i64,
     /// Progress toward rejecting pre-softfork blocks.
-    reject: SoftforkReject,
+    pub reject: SoftforkReject,
 }
 
 /// Progress toward rejecting pre-softfork blocks.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct SoftforkReject {
     /// `true` if threshold reached.
-    status: bool,
+    pub status: bool,
 }
 
 /// Status of BIP-9 softforksin progress.
@@ -185,15 +196,15 @@ pub enum Bip9SoftforkStatus {
 /// Result of JSON-RPC method `getblockcount`.
 ///
 /// > getblockcount
-///
+/// >
 /// > Returns the number of blocks in the longest blockchain.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct GetBlockCount(pub u64);
 
 /// Result of JSON-RPC method `getblockhash`.
 ///
 /// > Returns hash of block in best-block-chain at height provided.
-///
+/// >
 /// > Arguments:
 /// > 1. height         (numeric, required) The height index
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
@@ -472,13 +483,6 @@ pub struct GetMempoolDescendantsVerbose(pub BTreeMap<String, MempoolEntry>);
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct GetMempoolEntry(pub MempoolEntry);
 
-impl GetMempoolEntry {
-    /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> Result<model::GetMempoolEntry, MempoolEntryError> {
-        Ok(model::GetMempoolEntry(self.0.into_model()?))
-    }
-}
-
 /// A relative (ancestor or descendant) transaction of a transaction in the mempool.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct MempoolEntry {

types/src/v17/mod.rs

@@ -62,7 +62,7 @@
 //!
 //! | JSON-PRC Method Name               | Status          |
 //! |:-----------------------------------|:---------------:|
-//! | generate                           | done (untested) |
+//! | generate                           | done            |
 //! | generatetoaddress                  | done            |
 //!
 //! </details>

types/src/v18/mod.rs

@@ -68,7 +68,7 @@
 //!
 //! | JSON-PRC Method Name               | Status          |
 //! |:-----------------------------------|:---------------:|
-//! | generate                           | done (untested) |
+//! | generate                           | omitted         |
 //! | generatetoaddress                  | done            |
 //!
 //! </details>

types/src/v19/blockchain/mod.rs

@@ -16,8 +16,8 @@ pub use self::error::*;
 
 /// Result of JSON-RPC method `getblockchaininfo`.
 ///
-/// Method call: `getblockchaininfo`
-///
+/// > getblockchaininfo
+/// >
 /// > Returns an object containing various state info regarding blockchain processing.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct GetBlockchainInfo {

types/src/v19/mod.rs

@@ -52,10 +52,10 @@
 //! |:-----------------------------------|:---------------:|
 //! | getmemoryinfo                      | done            |
 //! | getrpcinfo                         | done            |
-//! | help                               | omitted         |
+//! | help                               | done            |
 //! | logging                            | done            |
-//! | stop                               | omitted         |
-//! | uptime                             | omitted         |
+//! | stop                               | done            |
+//! | uptime                             | done            |
 //!
 //! </details>
 //!

types/src/v20/mod.rs

@@ -52,10 +52,10 @@
 //! |:-----------------------------------|:---------------:|
 //! | getmemoryinfo                      | done            |
 //! | getrpcinfo                         | done            |
-//! | help                               | omitted         |
+//! | help                               | done            |
 //! | logging                            | done            |
-//! | stop                               | omitted         |
-//! | uptime                             | omitted         |
+//! | stop                               | done            |
+//! | uptime                             | done            |
 //!
 //! </details>
 //!