From 7c299f56a7882b974a3ea5da6f437fc2c50fa58c Mon Sep 17 00:00:00 2001 From: Daniel Connolly Date: Sat, 9 Mar 2024 21:29:21 +0100 Subject: [PATCH] v0.19.3 - correct exposure of types from dependency - bitcoinsv v0.2.4 - cargo update --- CHANGELOG.md | 5 +++++ Cargo.lock | 9 +++++---- client/Cargo.toml | 4 ++-- client/src/client.rs | 5 +++-- client/src/error.rs | 7 +++---- client/src/lib.rs | 2 +- integration_test/Cargo.toml | 1 + integration_test/src/main.rs | 3 ++- json/Cargo.toml | 4 ++-- json/src/lib.rs | 5 ++--- 10 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0ad30c..00b58d63 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/Cargo.lock b/Cargo.lock index 20bd1a6b..74940646 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -75,9 +75,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitcoinsv" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e366e5aea4713630e533d14ee871951307abed5d4eb771d900cb67e95403" +checksum = "ddf3816a57c3d6b0db0035c56640302877e63234b1bd297a58c24d2b13c14e0b" dependencies = [ "async-trait", "futures", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "bitcoinsv-rpc" -version = "0.19.2" +version = "0.19.3" dependencies = [ "async-trait", "bitcoinsv", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "bitcoinsv-rpc-json" -version = "0.19.2" +version = "0.19.3" dependencies = [ "approx", "bitcoinsv", @@ -302,6 +302,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" name = "integration_test" version = "0.1.0" dependencies = [ + "bitcoinsv", "bitcoinsv-rpc", "env_logger", "lazy_static", diff --git a/client/Cargo.toml b/client/Cargo.toml index 9ca86062..3c323a98 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitcoinsv-rpc" -version = "0.19.2" +version = "0.19.3" authors = [ "Daniel Connolly " ] @@ -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] diff --git a/client/src/client.rs b/client/src/client.rs index 470bcf1c..7decd880 100644 --- a/client/src/client.rs +++ b/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; diff --git a/client/src/error.rs b/client/src/error.rs index 31a3663e..3e8f08e7 100644 --- a/client/src/error.rs +++ b/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 for Error { @@ -56,8 +55,8 @@ impl From for Error { } } -impl From for Error { - fn from(e: bitcoinsv_rpc_json::Error) -> Error { +impl From for Error { + fn from(e: bitcoinsv::Error) -> Error { Error::SVJsonError(e) } } diff --git a/client/src/lib.rs b/client/src/lib.rs index bcbb7d10..7088a888 100644 --- a/client/src/lib.rs +++ b/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; diff --git a/integration_test/Cargo.toml b/integration_test/Cargo.toml index 3d2e923e..95872e0d 100644 --- a/integration_test/Cargo.toml +++ b/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" diff --git a/integration_test/src/main.rs b/integration_test/src/main.rs index 2fb24034..05d27ec0 100644 --- a/integration_test/src/main.rs +++ b/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. diff --git a/json/Cargo.toml b/json/Cargo.toml index d552019b..ecf77ee4 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitcoinsv-rpc-json" -version = "0.19.2" +version = "0.19.3" authors = [ "Daniel Connolly ", ] @@ -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" diff --git a/json/src/lib.rs b/json/src/lib.rs index 63d794a9..486eee01 100644 --- a/json/src/lib.rs +++ b/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. ///