From 3ae54ea7d09207ad4471266d27cbe58dfab5d0df Mon Sep 17 00:00:00 2001 From: bennyhodl Date: Tue, 10 Dec 2024 14:52:30 -0500 Subject: [PATCH 1/2] chore: release 0.7.1 --- dlc-manager/Cargo.toml | 8 ++++---- dlc-messages/Cargo.toml | 4 ++-- dlc-trie/Cargo.toml | 4 ++-- dlc/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlc-manager/Cargo.toml b/dlc-manager/Cargo.toml index 15bd6b7c..1afd54d9 100644 --- a/dlc-manager/Cargo.toml +++ b/dlc-manager/Cargo.toml @@ -6,7 +6,7 @@ homepage = "https://github.com/p2pderivatives/rust-dlc" license-file = "../LICENSE" name = "dlc-manager" repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-manager" -version = "0.7.0" +version = "0.7.1" [features] default = ["std"] @@ -18,9 +18,9 @@ use-serde = ["serde", "dlc/use-serde", "dlc-messages/use-serde", "dlc-trie/use-s [dependencies] async-trait = "0.1.50" bitcoin = { version = "0.32.2", default-features = false } -dlc = { version = "0.7.0", default-features = false, path = "../dlc" } -dlc-messages = { version = "0.7.0", default-features = false, path = "../dlc-messages" } -dlc-trie = { version = "0.7.0", default-features = false, path = "../dlc-trie" } +dlc = { version = "0.7.1", default-features = false, path = "../dlc" } +dlc-messages = { version = "0.7.1", default-features = false, path = "../dlc-messages" } +dlc-trie = { version = "0.7.1", default-features = false, path = "../dlc-trie" } hex = { package = "hex-conservative", version = "0.1" } lightning = { version = "0.0.125", default-features = false, features = ["grind_signatures"] } log = "0.4.14" diff --git a/dlc-messages/Cargo.toml b/dlc-messages/Cargo.toml index 27ac3fdb..a2346c65 100644 --- a/dlc-messages/Cargo.toml +++ b/dlc-messages/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://github.com/p2pderivatives/rust-dlc" license-file = "../LICENSE" name = "dlc-messages" repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-messages" -version = "0.7.0" +version = "0.7.1" [features] default = ["std"] @@ -15,7 +15,7 @@ use-serde = ["serde", "secp256k1-zkp/serde", "bitcoin/serde"] [dependencies] bitcoin = { version = "0.32.2", default-features = false } -dlc = { version = "0.7.0", path = "../dlc", default-features = false } +dlc = { version = "0.7.1", path = "../dlc", default-features = false } lightning = { version = "0.0.125", default-features = false } secp256k1-zkp = {version = "0.11.0"} serde = {version = "1.0", features = ["derive"], optional = true} diff --git a/dlc-trie/Cargo.toml b/dlc-trie/Cargo.toml index 23bfbbba..139390c7 100644 --- a/dlc-trie/Cargo.toml +++ b/dlc-trie/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://github.com/p2pderivatives/rust-dlc" license-file = "../LICENSE" name = "dlc-trie" repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc-trie" -version = "0.7.0" +version = "0.7.1" [features] default = ["std"] @@ -16,7 +16,7 @@ use-serde = ["serde", "dlc/use-serde"] [dependencies] bitcoin = { version = "0.32.2", default-features = false } -dlc = {version = "0.7.0", default-features = false, path = "../dlc"} +dlc = {version = "0.7.1", default-features = false, path = "../dlc"} rayon = {version = "1.5", optional = true} secp256k1-zkp = {version = "0.11.0" } serde = {version = "1.0", optional = true, default-features = false, features = ["derive"]} diff --git a/dlc/Cargo.toml b/dlc/Cargo.toml index 6fad3943..93e969fa 100644 --- a/dlc/Cargo.toml +++ b/dlc/Cargo.toml @@ -5,7 +5,7 @@ homepage = "https://github.com/p2pderivatives/rust-dlc" license-file = "../LICENSE" name = "dlc" repository = "https://github.com/p2pderivatives/rust-dlc/tree/master/dlc" -version = "0.7.0" +version = "0.7.1" [dependencies] bitcoin = { version = "0.32.2", default-features = false } From 82504ba57bd5d0b07c2aab08964e313a3156f07f Mon Sep 17 00:00:00 2001 From: bennyhodl Date: Tue, 10 Dec 2024 15:12:09 -0500 Subject: [PATCH 2/2] fix new clippy warning with 1.83.0 stable --- dlc-manager/src/channel_updater.rs | 1 - dlc-messages/src/contract_msgs.rs | 1 - dlc-trie/src/multi_oracle_trie.rs | 4 ++-- dlc-trie/src/multi_oracle_trie_with_diff.rs | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlc-manager/src/channel_updater.rs b/dlc-manager/src/channel_updater.rs index e55d475c..ae026c52 100644 --- a/dlc-manager/src/channel_updater.rs +++ b/dlc-manager/src/channel_updater.rs @@ -2226,7 +2226,6 @@ where } /// Sign the settlement transaction and update the state of the channel. - pub(crate) fn close_settled_channel( secp: &Secp256k1, signed_channel: &SignedChannel, diff --git a/dlc-messages/src/contract_msgs.rs b/dlc-messages/src/contract_msgs.rs index d6678e14..8287e70c 100644 --- a/dlc-messages/src/contract_msgs.rs +++ b/dlc-messages/src/contract_msgs.rs @@ -72,7 +72,6 @@ impl ContractInfo { serde(rename_all = "camelCase") )] /// Information for a contract based on a single event. - pub struct SingleContractInfo { /// The total collateral locked in the contract. pub total_collateral: u64, diff --git a/dlc-trie/src/multi_oracle_trie.rs b/dlc-trie/src/multi_oracle_trie.rs index 20f979a2..0274abe5 100644 --- a/dlc-trie/src/multi_oracle_trie.rs +++ b/dlc-trie/src/multi_oracle_trie.rs @@ -259,7 +259,7 @@ impl<'a> DlcTrie<'a, MultiOracleTrieIter<'a>> for MultiOracleTrie { Ok(trie_infos) } - fn iter(&'a self) -> MultiOracleTrieIter { + fn iter(&'a self) -> MultiOracleTrieIter<'a> { let digit_trie_iterator = DigitTrieIter::new(&self.digit_trie); let extra_cover_trie_iterator = self.extra_cover_trie.as_ref().map(MultiTrieIterator::new); MultiOracleTrieIter { @@ -286,7 +286,7 @@ pub struct MultiOracleTrieIter<'a> { oracle_numeric_infos: OracleNumericInfo, } -impl<'a> Iterator for MultiOracleTrieIter<'a> { +impl Iterator for MultiOracleTrieIter<'_> { type Item = TrieIterInfo; fn next(&mut self) -> Option { diff --git a/dlc-trie/src/multi_oracle_trie_with_diff.rs b/dlc-trie/src/multi_oracle_trie_with_diff.rs index 67c87c76..5f86dce6 100644 --- a/dlc-trie/src/multi_oracle_trie_with_diff.rs +++ b/dlc-trie/src/multi_oracle_trie_with_diff.rs @@ -141,7 +141,7 @@ pub struct MultiOracleTrieWithDiffIter<'a> { multi_trie_iterator: MultiTrieIterator<'a, RangeInfo>, } -impl<'a> Iterator for MultiOracleTrieWithDiffIter<'a> { +impl Iterator for MultiOracleTrieWithDiffIter<'_> { type Item = TrieIterInfo; fn next(&mut self) -> Option {