v0.19.3

- correct exposure of types from dependency
- bitcoinsv v0.2.4
- cargo update

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.19.3
+- correct exposure of types from dependency
+- bitcoinsv v0.2.4
+- cargo update
+
 # 0.19.2
 - Updated to use bitcoinsv crate v0.2.2.
 - Using verbosity level 2 for get_block_header_info to provide more information.

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bitcoinsv-rpc"
-version = "0.19.2"
+version = "0.19.3"
 authors = [
     "Daniel Connolly <[email protected]>"
 ]
@@ -23,7 +23,7 @@ jsonrpc = { version = "0.16.0", features = ["minreq_http"]}
 serde = "1"
 serde_json = "1"
 hex = "0.4.3"
-bitcoinsv = "0.2.2"
+bitcoinsv = "0.2.4"
 async-trait = "0.1.75"
 
 [dev-dependencies]

client/src/client.rs

@@ -12,8 +12,9 @@ use serde;
 use serde_json;
 
 use log::Level::{Debug, Trace, Warn};
-use bitcoinsv::bitcoin::{BlockHeader, FullBlockStream};
-use bitcoinsv_rpc_json::{Tx, TxHash, BlockHash, Amount, GetNetworkInfoResult};
+use bitcoinsv::bitcoin::{BlockHeader, FullBlockStream, Tx, TxHash, BlockHash};
+use bitcoinsv::util::Amount;
+use bitcoinsv_rpc_json::GetNetworkInfoResult;
 
 use crate::error::*;
 use crate::json;

client/src/error.rs

@@ -15,9 +15,8 @@ pub enum Error {
     UnexpectedStructure,
     /// The daemon returned an error string.
     ReturnedError(String),
-    // BitcoinSVError(bitcoinsv::Error),
     MinReqError(jsonrpc::minreq_http::Error),
-    SVJsonError(bitcoinsv_rpc_json::Error),
+    SVJsonError(bitcoinsv::Error),
 }
 
 impl From<jsonrpc::error::Error> for Error {
@@ -56,8 +55,8 @@ impl From<jsonrpc::minreq_http::Error> for Error {
     }
 }
 
-impl From<bitcoinsv_rpc_json::Error> for Error {
-    fn from(e: bitcoinsv_rpc_json::Error) -> Error {
+impl From<bitcoinsv::Error> for Error {
+    fn from(e: bitcoinsv::Error) -> Error {
         Error::SVJsonError(e)
     }
 }

client/src/lib.rs

@@ -28,6 +28,6 @@ pub use json::*;
 mod client;
 mod error;
 
-pub use crate::client::*;
+pub use crate::client::{Auth, Client, RpcApi};
 pub use crate::error::Error;
 

integration_test/Cargo.toml

@@ -11,3 +11,4 @@ log = "0.4"
 env_logger = "0.10.1"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
+bitcoinsv = "0.2.4"

integration_test/src/main.rs

@@ -13,7 +13,8 @@
 
 use tokio_stream::StreamExt;
 use bitcoinsv_rpc::jsonrpc::error::Error as JsonRpcError;
-use bitcoinsv_rpc::{Auth, BlockchainId, Client, Error, RpcApi};
+use bitcoinsv_rpc::{Auth, Client, Error, RpcApi};
+use bitcoinsv::bitcoin::BlockchainId;
 
 
 /// Assert that the call returns the specified error message.

json/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bitcoinsv-rpc-json"
-version = "0.19.2"
+version = "0.19.3"
 authors = [
     "Daniel Connolly <[email protected]>",
 ]
@@ -20,7 +20,7 @@ path = "src/lib.rs"
 hex = "0.4.3"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-bitcoinsv = "0.2.2"
+bitcoinsv = "0.2.4"
 
 [dev-dependencies]
 approx = "0.5"

json/src/lib.rs

@@ -14,9 +14,8 @@ extern crate alloc;
 use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 use std::fmt;
-pub use bitcoinsv::Error;
-pub use bitcoinsv::bitcoin::{BlockchainId, BlockHash, Encodable, Hash, MerkleRoot, Tx, TxHash};
-pub use bitcoinsv::util::Amount;
+use bitcoinsv::bitcoin::{BlockchainId, BlockHash, Encodable, Hash, MerkleRoot, Tx, TxHash};
+use bitcoinsv::util::Amount;
 
 /// A module used for serde serialization of bytes in hexadecimal format.
 ///