From 29b1a9b129fdfc50db790b6b6923cf36034a267c Mon Sep 17 00:00:00 2001 From: cameron Date: Thu, 3 Mar 2022 18:29:50 +0000 Subject: [PATCH 1/3] replace pack_pool_registration with serde traits --- chain-impl-mockchain/src/ledger/recovery.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/chain-impl-mockchain/src/ledger/recovery.rs b/chain-impl-mockchain/src/ledger/recovery.rs index c5587858d..89fa3a752 100644 --- a/chain-impl-mockchain/src/ledger/recovery.rs +++ b/chain-impl-mockchain/src/ledger/recovery.rs @@ -310,18 +310,10 @@ fn pack_pool_registration( pool_registration: &PoolRegistration, codec: &mut Codec, ) -> Result<(), WriteError> { - let byte_array = pool_registration.serialize(); - let bytes = byte_array.as_slice(); - let size = bytes.len() as u64; - // TODO: do not store extra bytes - codec.put_be_u64(size)?; - codec.put_bytes(bytes)?; - Ok(()) + Serialize::serialize(&pool_registration, codec) } fn unpack_pool_registration(codec: &mut Codec<&[u8]>) -> Result { - // TODO: do not store extra bytes - codec.get_be_u64()?; PoolRegistration::deserialize_from_slice(codec) } From 471f9b7a0e85b65a1bef2f691fe50f6d0a197adb Mon Sep 17 00:00:00 2001 From: cameron Date: Fri, 4 Mar 2022 05:50:32 +0000 Subject: [PATCH 2/3] fix clippy --- chain-network/src/grpc/server.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chain-network/src/grpc/server.rs b/chain-network/src/grpc/server.rs index 4fcc57c19..fe04779d9 100644 --- a/chain-network/src/grpc/server.rs +++ b/chain-network/src/grpc/server.rs @@ -167,8 +167,8 @@ where let res = proto::node::PeersResponse { peers: peers .nodes - .to_vec() - .into_iter() + .iter() + .cloned() .map(|node| node.into_bytes()) .collect(), }; From 5d26ec9536af0536418df44ab939741ee9752504 Mon Sep 17 00:00:00 2001 From: cameron Date: Fri, 4 Mar 2022 07:23:45 +0000 Subject: [PATCH 3/3] actually fix clippy --- chain-impl-mockchain/src/accounting/account/mod.rs | 6 +++--- chain-impl-mockchain/src/testing/arbitrary/utils.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chain-impl-mockchain/src/accounting/account/mod.rs b/chain-impl-mockchain/src/accounting/account/mod.rs index a129f9c93..c62b141a7 100644 --- a/chain-impl-mockchain/src/accounting/account/mod.rs +++ b/chain-impl-mockchain/src/accounting/account/mod.rs @@ -271,16 +271,16 @@ mod tests { let mut ledger = Ledger::new(); // Add all arbitrary accounts - for account_id in arbitrary_accounts_ids.iter().cloned() { + for account_id in arbitrary_accounts_ids.iter() { ledger = ledger - .add_account(&account_id, AverageValue::arbitrary(gen).into(), ()) + .add_account(account_id, AverageValue::arbitrary(gen).into(), ()) .unwrap(); for token in &arbitrary_voting_tokens { // TODO: maybe less probability is better (for performance) if bool::arbitrary(gen) { ledger = ledger - .token_add(&account_id, token.clone(), Value::arbitrary(gen)) + .token_add(account_id, token.clone(), Value::arbitrary(gen)) .unwrap(); } } diff --git a/chain-impl-mockchain/src/testing/arbitrary/utils.rs b/chain-impl-mockchain/src/testing/arbitrary/utils.rs index bc17defbe..a28e04818 100644 --- a/chain-impl-mockchain/src/testing/arbitrary/utils.rs +++ b/chain-impl-mockchain/src/testing/arbitrary/utils.rs @@ -25,7 +25,7 @@ where let mut matrix: Vec> = (0..number_of_splits) .map(|_| Vec::with_capacity(number_of_splits)) .collect(); - for x in source.iter().cloned() { + for x in source { let index = usize::arbitrary(gen) % number_of_splits; matrix.get_mut(index).unwrap().push(x.clone()); }