Merge pull request #440 from Chia-Network/remove-use-streamable

Remove unnecessary use Streamable
Chia-Network · Mar 18, 2024 · 81d7bac · 81d7bac
2 parents 3b292e5 + 5c87186
commit 81d7bac
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 24 deletions.
diff --git a/crates/chia-protocol/src/block_record.rs b/crates/chia-protocol/src/block_record.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 use crate::{Bytes32, ClassgroupElement, Coin, SubEpochSummary};
 

diff --git a/crates/chia-protocol/src/classgroup.rs b/crates/chia-protocol/src/classgroup.rs
@@ -1,5 +1,5 @@
 use crate::Bytes100;
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 #[cfg(feature = "py-bindings")]
 use pyo3::prelude::*;

diff --git a/crates/chia-protocol/src/coin.rs b/crates/chia-protocol/src/coin.rs
@@ -1,5 +1,5 @@
 use crate::{bytes::Bytes32, BytesImpl};
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 use clvm_traits::{
     clvm_list, destructure_list, match_list, ClvmDecoder, ClvmEncoder, FromClvm, FromClvmError,
     ToClvm, ToClvmError,

diff --git a/crates/chia-protocol/src/coin_spend.rs b/crates/chia-protocol/src/coin_spend.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 use crate::coin::Coin;
 use crate::program::Program;

diff --git a/crates/chia-protocol/src/coin_state.rs b/crates/chia-protocol/src/coin_state.rs
@@ -1,5 +1,5 @@
 use crate::coin::Coin;
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 #[streamable]
 pub struct CoinState {

diff --git a/crates/chia-protocol/src/end_of_sub_slot_bundle.rs b/crates/chia-protocol/src/end_of_sub_slot_bundle.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::ChallengeChainSubSlot;
 use crate::InfusedChallengeChainSubSlot;

diff --git a/crates/chia-protocol/src/fee_estimate.rs b/crates/chia-protocol/src/fee_estimate.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 #[streamable]
 pub struct FeeRate {

diff --git a/crates/chia-protocol/src/foliage.rs b/crates/chia-protocol/src/foliage.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::Coin;

diff --git a/crates/chia-protocol/src/full_node_protocol.rs b/crates/chia-protocol/src/full_node_protocol.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::EndOfSubSlotBundle;
 use crate::FullBlock;

diff --git a/crates/chia-protocol/src/fullblock.rs b/crates/chia-protocol/src/fullblock.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::Coin;

diff --git a/crates/chia-protocol/src/header_block.rs b/crates/chia-protocol/src/header_block.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes;
 use crate::Bytes32;

diff --git a/crates/chia-protocol/src/peer_info.rs b/crates/chia-protocol/src/peer_info.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 #[streamable]
 pub struct TimestampedPeerInfo {

diff --git a/crates/chia-protocol/src/pool_target.rs b/crates/chia-protocol/src/pool_target.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 use crate::Bytes32;
 

diff --git a/crates/chia-protocol/src/proof_of_space.rs b/crates/chia-protocol/src/proof_of_space.rs
@@ -1,6 +1,6 @@
 use crate::bytes::{Bytes, Bytes32};
 use chia_bls::G1Element;
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 #[streamable]
 pub struct ProofOfSpace {

diff --git a/crates/chia-protocol/src/reward_chain_block.rs b/crates/chia-protocol/src/reward_chain_block.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::ProofOfSpace;

diff --git a/crates/chia-protocol/src/slots.rs b/crates/chia-protocol/src/slots.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::ProofOfSpace;

diff --git a/crates/chia-protocol/src/spend_bundle.rs b/crates/chia-protocol/src/spend_bundle.rs
@@ -3,7 +3,6 @@ use crate::Bytes32;
 use crate::Coin;
 use chia_bls::G2Element;
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 use chia_traits::Streamable;
 use clvm_traits::FromClvm;
 use clvmr::allocator::{NodePtr, SExp};

diff --git a/crates/chia-protocol/src/sub_epoch_summary.rs b/crates/chia-protocol/src/sub_epoch_summary.rs
@@ -1,6 +1,6 @@
-use crate::Bytes32;
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
+
+use crate::Bytes32;
 
 #[streamable]
 pub struct SubEpochSummary {

diff --git a/crates/chia-protocol/src/unfinished_block.rs b/crates/chia-protocol/src/unfinished_block.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::EndOfSubSlotBundle;

diff --git a/crates/chia-protocol/src/vdf.rs b/crates/chia-protocol/src/vdf.rs
@@ -1,4 +1,4 @@
-use chia_streamable_macro::{streamable, Streamable};
+use chia_streamable_macro::streamable;
 
 use crate::ClassgroupElement;
 use crate::{Bytes, Bytes32};

diff --git a/crates/chia-protocol/src/wallet_protocol.rs b/crates/chia-protocol/src/wallet_protocol.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Coin;
 use crate::CoinState;

diff --git a/crates/chia-protocol/src/weight_proof.rs b/crates/chia-protocol/src/weight_proof.rs
@@ -1,5 +1,4 @@
 use chia_streamable_macro::streamable;
-use chia_streamable_macro::Streamable;
 
 use crate::Bytes32;
 use crate::EndOfSubSlotBundle;

diff --git a/crates/chia_streamable_macro/src/lib.rs b/crates/chia_streamable_macro/src/lib.rs
@@ -90,7 +90,7 @@ pub fn streamable(attr: TokenStream, item: TokenStream) -> TokenStream {
     }
 
     let main_derives = quote! {
-        #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)]
+        #[derive(chia_streamable_macro::Streamable, Hash, Debug, Clone, Eq, PartialEq)]
     };
 
     // If you're calling the macro from `chia-protocol`, enable Python bindings and fuzzing conditionally.