Skip to content

Commit 71232f9

Browse files
committed
Upgrade bitcoin requirement from 0.28.1 to 0.29.1
1 parent 8c93e0d commit 71232f9

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ path = "src/lib.rs"
1717

1818
[dependencies]
1919
serde = { version = "1.0", features = ["derive"] }
20-
bitcoin = { version = "0.28.1", features = ["use-serde"] }
20+
bitcoin = { version = "0.29.1", features = ["serde"] }
2121
log = "^0.4"
2222
ureq = { version = "~2.2.0", features = ["json"], optional = true }
2323
reqwest = { version = "0.11", optional = true, default-features = false, features = ["json"] }
2424

2525
[dev-dependencies]
2626
serde_json = "1.0"
2727
tokio = { version = "1.20.1", features = ["full"] }
28-
electrsd = { version = "0.19.1", features = ["legacy", "esplora_a33e97e1", "bitcoind_22_0"] }
29-
electrum-client = "0.10"
28+
electrsd = { version = "0.21.1", features = ["legacy", "esplora_a33e97e1", "bitcoind_22_0"] }
29+
electrum-client = "0.12.0"
3030
lazy_static = "1.4.0"
3131

3232
[features]

src/api.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl Tx {
8383
pub fn to_tx(&self) -> Transaction {
8484
Transaction {
8585
version: self.version,
86-
lock_time: self.locktime,
86+
lock_time: bitcoin::PackedLockTime(self.locktime),
8787
input: self
8888
.vin
8989
.iter()
@@ -94,7 +94,7 @@ impl Tx {
9494
vout: vin.vout,
9595
},
9696
script_sig: vin.scriptsig,
97-
sequence: vin.sequence,
97+
sequence: bitcoin::Sequence(vin.sequence),
9898
witness: Witness::from_vec(vin.witness),
9999
})
100100
.collect(),

src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ mod test {
201201
use electrsd::{bitcoind, bitcoind::BitcoinD, ElectrsD};
202202
use lazy_static::lazy_static;
203203
use std::env;
204+
use bitcoin::hashes::Hash;
204205
use tokio::sync::Mutex;
205206
#[cfg(all(feature = "blocking", any(feature = "async", feature = "async-https")))]
206207
use {
@@ -491,7 +492,7 @@ mod test {
491492

492493
let (blocking_client, async_client) = setup_clients().await;
493494

494-
let block_hash = BlockHash::default();
495+
let block_hash = BlockHash::all_zeros();
495496

496497
let expected = BlockStatus {
497498
in_best_chain: false,

0 commit comments

Comments
 (0)