Skip to content

Commit

Permalink
Merge pull request #12 from antonilol/update-deps
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
antonilol authored May 17, 2024
2 parents 50004de + 33ffa08 commit a96dd94
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ async = ["dep:async_zmq", "dep:futures-util"]

[dependencies]
async_zmq = { version = "0.4.0", optional = true }
bitcoin = "0.31.1"
futures-util = { version = "0.3.28", optional = true }
bitcoin = "0.32.0"
futures-util = { version = "0.3.30", optional = true }
zmq = "0.10.0"
zmq-sys = "0.12.0"

# dependencies used in examples
[dev-dependencies]
futures = "0.3.28"
tokio = { version = "1.35.0", features = ["time", "rt-multi-thread", "macros"] }
futures = "0.3.30"
tokio = { version = "1.37.0", features = ["time", "rt-multi-thread", "macros"] }

[[example]]
name = "subscribe_async_timeout"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Integration tests use the latest version of the 5 most recent major Bitcoin Core
TODO:
- This README
- SequenceMessage itest
- Easy addEventListener like functionality with help of the `getzmqnotifications` rpc (bitcoincore-rpc PR: [#295](https://github.com/rust-bitcoin/rust-bitcoincore-rpc/pull/295))
- Easy addEventListener like functionality with help of the `getzmqnotifications` rpc
- raw messages
- zmq publisher
- include source in message
8 changes: 4 additions & 4 deletions integration_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "1.0.0"
edition = "2021"

[dependencies]
bitcoin = "0.31.1"
bitcoincore-rpc = "0.18.0"
bitcoin = "0.32.0"
bitcoincore-rpc = "0.19.0"
bitcoincore-zmq = { path = "..", features = ["async"] }
futures = "0.3.28"
tokio = { version = "1.35.0", features = ["full"] }
futures = "0.3.30"
tokio = { version = "1.37.0", features = ["full"] }
2 changes: 1 addition & 1 deletion integration_tests/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn test_hashtx(rpc: &Client) {
match recv_timeout_2(&receiver) {
(Message::Tx(tx, _), Message::HashTx(txid, _))
| (Message::HashTx(txid, _), Message::Tx(tx, _)) => {
assert_eq!(tx.txid(), txid);
assert_eq!(tx.compute_txid(), txid);
}
(msg1, msg2) => {
panic!("invalid messages received: ({msg1}, {msg2})");
Expand Down
6 changes: 3 additions & 3 deletions src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ impl fmt::Display for Message {
Self::HashBlock(blockhash, seq) => write!(f, "HashBlock({blockhash}, sequence={seq})"),
Self::HashTx(txid, seq) => write!(f, "HashTx({txid}, sequence={seq})"),
Self::Block(block, seq) => write!(f, "Block({}, sequence={seq})", block.block_hash()),
Self::Tx(tx, seq) => write!(f, "Tx({}, sequence={seq})", tx.txid()),
Self::Tx(tx, seq) => write!(f, "Tx({}, sequence={seq})", tx.compute_txid()),
Self::Sequence(sm, seq) => write!(f, "Sequence({sm}, sequence={seq})"),
}
}
Expand All @@ -198,7 +198,7 @@ mod tests {

let tx = &genesis_block.txdata[0];
let tx_bytes = serialize(tx);
let txid = tx.txid();
let txid = tx.compute_txid();
let mut txid_bytes = txid.to_byte_array();
txid_bytes.reverse();

Expand Down Expand Up @@ -241,7 +241,7 @@ mod tests {
fn test_deserialize_hashtx() {
let genesis_block = genesis_block(Network::Bitcoin);

let txid = genesis_block.txdata[0].txid();
let txid = genesis_block.txdata[0].compute_txid();
let mut txid_bytes = txid.to_byte_array();
txid_bytes.reverse();

Expand Down
2 changes: 1 addition & 1 deletion src/sequence_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ mod tests {
let mut blockhash_bytes = blockhash.to_byte_array();
blockhash_bytes.reverse();

let txid = genesis_block.txdata[0].txid();
let txid = genesis_block.txdata[0].compute_txid();
let mut txid_bytes = txid.to_byte_array();
txid_bytes.reverse();

Expand Down

0 comments on commit a96dd94

Please sign in to comment.