Updated all versions to 1.0.7, misc clippy fixes

GalactechsLLC · Sep 22, 2023 · 4e43e68 · 4e43e68
1 parent be18c90
commit 4e43e68
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_cli"
-version = "1.0.6"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "CLI Utilities for the Chia Blockchain"
@@ -13,10 +13,10 @@ bip39 = {version= "2.0.0", features=["rand"] }
 blst = "0.3.7"
 clap = { version = "4.1.1", features = ["derive"] }
 dg_xch_clients = {path = "../clients", version="1.0.7"}
-dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
-dg_xch_keys = {path = "../keys", version="1.0.5"}
-dg_xch_pos = {path = "../proof_of_space", version="1.0.5"}
-dg_xch_puzzles = {path = "../puzzles", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
+dg_xch_keys = {path = "../keys", version="1.0.7"}
+dg_xch_pos = {path = "../proof_of_space", version="1.0.7"}
+dg_xch_puzzles = {path = "../puzzles", version="1.0.7"}
 lazy_static = "1.4.0"
 log = "0.4.17"
 rayon = "1.7.0"

diff --git a/clients/Cargo.toml b/clients/Cargo.toml
@@ -10,10 +10,10 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/clients"
 
 [dependencies]
 async-trait = "0.1.58"
-dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
-dg_xch_macros = {path = "../macros", version="1.0.5"}
-dg_xch_pos = {path = "../proof_of_space", version="1.0.5"}
-dg_xch_serialize = {path = "../serialize", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
+dg_xch_macros = {path = "../macros", version="1.0.7"}
+dg_xch_pos = {path = "../proof_of_space", version="1.0.7"}
+dg_xch_serialize = {path = "../serialize", version="1.0.7"}
 futures-util = "0.3.25"
 hyper = {version="0.14.23", features=["full"]}
 log = "0.4.17"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_core"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Core library containing type/error definitions, CLVM tools, Consensus and Pool definitions"
@@ -14,8 +14,8 @@ bip39 = {version= "2.0.0", features=["rand"] }
 bls12_381 = "0.8.0"
 blst = "0.3.7"
 bytes = "1.4.0"
-dg_xch_macros = {path = "../macros", version="1.0.5"}
-dg_xch_serialize = {path = "../serialize", version="1.0.5"}
+dg_xch_macros = {path = "../macros", version="1.0.7"}
+dg_xch_serialize = {path = "../serialize", version="1.0.7"}
 hex = "0.4.3"
 hkdf = "0.12.3"
 lazy_static = "1.4.0"

diff --git a/core/src/ssl.rs b/core/src/ssl.rs
@@ -239,7 +239,7 @@ pub fn create_all_ssl_memory() -> Result<MemorySSL, Error> {
             key: ca_key_data,
         },
     );
-    private_map.extend(private_certs.into_iter());
+    private_map.extend(private_certs);
     info!("Generating Public Certs");
     let public_certs = generate_ssl_for_nodes_in_memory(
         CHIA_CA_CRT.as_bytes(),
@@ -253,7 +253,7 @@ pub fn create_all_ssl_memory() -> Result<MemorySSL, Error> {
             key: CHIA_CA_KEY.as_bytes().to_vec(),
         },
     );
-    public_map.extend(public_certs.into_iter());
+    public_map.extend(public_certs);
     Ok(MemorySSL {
         public: public_map,
         private: private_map,

diff --git a/keys/Cargo.toml b/keys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_keys"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Key Management Utils the Chia Blockchain"
@@ -12,7 +12,7 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/keys"
 bech32 = "0.9.1"
 blst = "0.3.7"
 bip39 = {version= "2.0.0", features=["rand"] }
-dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
-dg_xch_puzzles = {path = "../puzzles", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
+dg_xch_puzzles = {path = "../puzzles", version="1.0.7"}
 hkdf = "0.12.3"
 sha2 = "0.10.6"
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_macros"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 description = "Derive Marcos for Chia Serialization"
 license = "Apache-2.0"

diff --git a/proof_of_space/Cargo.toml b/proof_of_space/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_pos"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Proof of Space library for the Chia Blockchain"
@@ -10,8 +10,8 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/proof_of_space"
 
 [dependencies]
 blake3 = "1.3.1"
-dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
-dg_xch_serialize = {path = "../serialize", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
+dg_xch_serialize = {path = "../serialize", version="1.0.7"}
 hex = "0.4.3"
 lazy_static = "1.4.0"
 log = "0.4.17"

diff --git a/proof_of_space/src/entry_sizes.rs b/proof_of_space/src/entry_sizes.rs
@@ -15,7 +15,7 @@ impl EntrySizes {
                 }
             }
             // Represents f1, x
-            2 | 3 | 4 | 5 | 6 => {
+            2..=6 => {
                 if phase_1_size {
                     // If we are in phase 1, use the max size, with metadata.
                     // Represents f, pos, offset, and metadata

diff --git a/puzzles/Cargo.toml b/puzzles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_puzzles"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Core library for working with CLVM puzzles"
@@ -10,8 +10,8 @@ repository = "https://github.com/GalactechsLLC/dg_xch_utils/puzzles"
 
 [dependencies]
 blst = "0.3.7"
-dg_xch_core = {path = "../core", version = "1.0.5", features = ["paperclip"] }
-dg_xch_serialize = {path = "../serialize", version="1.0.5"}
+dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
+dg_xch_serialize = {path = "../serialize", version="1.0.7"}
 lazy_static = "1.4.0"
 num-bigint = "=0.4.0"
 num-integer = "0.1.45"

diff --git a/puzzles/src/clvm_puzzles.rs b/puzzles/src/clvm_puzzles.rs
@@ -205,7 +205,7 @@ pub fn get_seconds_and_delayed_puzhash_from_p2_singleton_puzzle(
 
 pub fn is_pool_singleton_inner_puzzle(inner_puzzle: &Program) -> Result<bool, Error> {
     let inner_f = get_template_singleton_inner_puzzle(inner_puzzle)?;
-    Ok(vec![POOL_WAITING_ROOM_MOD.clone(), POOL_MEMBER_MOD.clone()].contains(&inner_f))
+    Ok([POOL_WAITING_ROOM_MOD.clone(), POOL_MEMBER_MOD.clone()].contains(&inner_f))
 }
 
 pub fn is_pool_waitingroom_inner_puzzle(inner_puzzle: &Program) -> Result<bool, Error> {

diff --git a/serialize/Cargo.toml b/serialize/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_serialize"
-version = "1.0.5"
+version = "1.0.7"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "Low Level Support Package for dg_xch_utils"