use bitcoinsv dev version

Danconnolly · Feb 8, 2025 · 5c6f2b4 · 5c6f2b4
1 parent 6282b88
commit 5c6f2b4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,4 +7,5 @@ members = [
 ]
 
 [workspace.dependencies]
-bitcoinsv = "0.2.7"
+bitcoinsv = { git = "https://github.com/Danconnolly/rust-bitcoinsv.git" }
+
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib.rs"
 [dependencies]
 async-trait = "0.1.75"
 bitcoinsv = { workspace = true }
-bitcoinsv-rpc-json = { version = "1.0.2" }
+bitcoinsv-rpc-json = { path = "../json" }
 hex = "0.4.3"
 jsonrpc = { version = "0.16.0", features = ["minreq_http"]}
 log = "0.4.5"

diff --git a/client/src/error.rs b/client/src/error.rs
@@ -18,7 +18,7 @@ pub enum Error {
     /// The URI could not be parsed.
     InvalidUri,
     MinReqError(jsonrpc::minreq_http::Error),
-    SVJsonError(bitcoinsv::BsvError),
+    SVJsonError(bitcoinsv::Error),
 }
 
 impl From<jsonrpc::error::Error> for Error {
@@ -51,8 +51,8 @@ impl From<jsonrpc::minreq_http::Error> for Error {
     }
 }
 
-impl From<bitcoinsv::BsvError> for Error {
-    fn from(e: bitcoinsv::BsvError) -> Error {
+impl From<bitcoinsv::Error> for Error {
+    fn from(e: bitcoinsv::Error) -> Error {
         Error::SVJsonError(e)
     }
 }

diff --git a/integration_test/Cargo.toml b/integration_test/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 bitcoinsv = { workspace = true }
 bitcoinsv-rpc = { path = "../client" }
 tokio = { version = "1", features = ["full"] }
-tokio-stream = "0.1"
+tokio-stream = "0.1.17"
 
diff --git a/json/src/lib.rs b/json/src/lib.rs
@@ -646,7 +646,7 @@ impl GetRawTransactionResult {
         self.vin.len() == 1 && self.vin[0].is_coinbase()
     }
 
-    pub fn transaction(&self) -> Result<Tx, bitcoinsv::BsvError> {
+    pub fn transaction(&self) -> Result<Tx, bitcoinsv::Error> {
         let tx = Tx::from_hex(&self.hex)?;
         Ok(tx)
     }