From 86ecdbb6aad4fa93732f36f530f630d056f78cd7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 Nov 2024 20:21:14 +0100 Subject: [PATCH 01/11] unused field --- .../src/engines/hbbft/hbbft_early_epoch_end_manager.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs b/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs index 5ff30bcf0..7a959fd7a 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs @@ -39,7 +39,7 @@ pub(crate) struct HbbftEarlyEpochEndManager { node_id_to_address: BTreeMap, - address_to_node_id: BTreeMap, + // address_to_node_id: BTreeMap, signing_address: Address, } @@ -109,7 +109,7 @@ impl HbbftEarlyEpochEndManager { validators: validators, flagged_validators: flagged_validators, node_id_to_address, - address_to_node_id, + // address_to_node_id, signing_address: signing_address.clone(), }; From f349d7814a867ee34773c64699f1d14434174242 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 Nov 2024 20:23:04 +0100 Subject: [PATCH 02/11] cleanup --- .../src/engines/hbbft/hbbft_network_fork_manager.rs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs b/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs index d77d91faa..59831dc38 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs @@ -298,17 +298,11 @@ impl HbbftNetworkForkManager { #[cfg(test)] mod tests { - use std::{fs, str::FromStr}; - - use crate::engines::{hbbft::test::hbbft_test_client::HbbftTestClient, signer::from_keypair}; - - use super::*; - use ethereum_types::Address; + use std::str::FromStr; + use crate::engines::signer::from_keypair; + use super::*; use ethjson::spec::hbbft::HbbftNetworkFork; - use hbbft::sync_key_gen::{Ack, Part}; - use crypto::publickey::{KeyPair, Secret}; - //use parity_crypto::publickey::{KeyPair, Secret}; #[test] fn test_fork_manager_should_fork() { From 83d3c5a0a8fc5023d908ff02b4fee7924537fc39 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 Nov 2024 20:23:12 +0100 Subject: [PATCH 03/11] cleanup --- crates/ethcore/src/engines/hbbft/hbbft_engine.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/crates/ethcore/src/engines/hbbft/hbbft_engine.rs b/crates/ethcore/src/engines/hbbft/hbbft_engine.rs index 7f0f32e90..90bbdc30e 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_engine.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_engine.rs @@ -1175,9 +1175,6 @@ impl HoneyBadgerBFT { Err(e) => { error!(target: "consensus", "Error initializing synckeygen: {:?}", e); } - Err(_) => { - error!(target: "consensus", "Error initializing synckeygen: unknown Error"); - } } } } From 32f328d116fcddc2b1c6a29bf0fda381f8477315 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 Nov 2024 20:24:31 +0100 Subject: [PATCH 04/11] cargo fmt --all -- --config imports_granularity=Crate --- .../src/engines/hbbft/hbbft_early_epoch_end_manager.rs | 1 - .../ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs b/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs index 7a959fd7a..5b8f2411b 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs @@ -40,7 +40,6 @@ pub(crate) struct HbbftEarlyEpochEndManager { node_id_to_address: BTreeMap, // address_to_node_id: BTreeMap, - signing_address: Address, } diff --git a/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs b/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs index 59831dc38..b021e5a9c 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs @@ -298,11 +298,11 @@ impl HbbftNetworkForkManager { #[cfg(test)] mod tests { - use std::str::FromStr; + use super::*; use crate::engines::signer::from_keypair; - use super::*; - use ethjson::spec::hbbft::HbbftNetworkFork; use crypto::publickey::{KeyPair, Secret}; + use ethjson::spec::hbbft::HbbftNetworkFork; + use std::str::FromStr; #[test] fn test_fork_manager_should_fork() { From 63606660378fe72151da55a73906c872757cf726 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 Nov 2024 21:11:24 +0100 Subject: [PATCH 05/11] removed RequestMiddleware use --- bin/oe/rpc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/oe/rpc.rs b/bin/oe/rpc.rs index d098b2776..d4dd37c41 100644 --- a/bin/oe/rpc.rs +++ b/bin/oe/rpc.rs @@ -29,7 +29,7 @@ use parity_rpc::{ }; use parity_runtime::Executor; -pub use parity_rpc::{HttpServer, IpcServer, RequestMiddleware}; +pub use parity_rpc::{HttpServer, IpcServer}; //pub use parity_rpc::ws::Server as WsServer; pub use parity_rpc::ws::{ws, Server as WsServer}; From 8dfc0e9b18ea27586b6030999b5fbaedb92199b7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 Nov 2024 21:15:49 +0100 Subject: [PATCH 06/11] cargo fix --- crates/concensus/ethash/src/keccak.rs | 2 +- crates/ethcore/benches/builtin.rs | 3 +-- crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs | 2 +- crates/ethcore/src/engines/validator_set/safe_contract.rs | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/concensus/ethash/src/keccak.rs b/crates/concensus/ethash/src/keccak.rs index 134a11fb2..187e16b85 100644 --- a/crates/concensus/ethash/src/keccak.rs +++ b/crates/concensus/ethash/src/keccak.rs @@ -30,6 +30,6 @@ pub mod keccak_256 { use super::hash; pub use self::hash::{ - keccak256 as inplace, keccak256_range as inplace_range, keccak_256 as write, + keccak256 as inplace, keccak_256 as write, }; } diff --git a/crates/ethcore/benches/builtin.rs b/crates/ethcore/benches/builtin.rs index 47c6cd568..ffdce6242 100644 --- a/crates/ethcore/benches/builtin.rs +++ b/crates/ethcore/benches/builtin.rs @@ -50,8 +50,7 @@ impl<'a> BuiltinBenchmark<'a> { let builtin = builtins .get(&H160::from_str(builtin_address).unwrap()) - .unwrap() - .clone(); + .unwrap(); let input = FromHex::from_hex(input).unwrap(); let expected = FromHex::from_hex(expected).unwrap(); diff --git a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs index e008790c2..26e7a5e2c 100644 --- a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs +++ b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs @@ -1,7 +1,7 @@ use client::traits::EngineClient; use crypto::{ self, - publickey::{ec_math_utils::public_add, Public}, + publickey::{Public}, }; use engines::{ hbbft::{ diff --git a/crates/ethcore/src/engines/validator_set/safe_contract.rs b/crates/ethcore/src/engines/validator_set/safe_contract.rs index 135f5a898..7d56ba5d8 100644 --- a/crates/ethcore/src/engines/validator_set/safe_contract.rs +++ b/crates/ethcore/src/engines/validator_set/safe_contract.rs @@ -861,7 +861,7 @@ mod tests { use types::{header::Header, log_entry::LogEntry}; let client = generate_dummy_client_with_spec(Spec::new_validator_safe_contract); - let engine = client.engine().clone(); + let engine = client.engine(); let validator_contract = "0000000000000000000000000000000000000005" .parse::
() .unwrap(); @@ -900,7 +900,7 @@ mod tests { use types::header::Header; let client = generate_dummy_client_with_spec(Spec::new_validator_safe_contract); - let engine = client.engine().clone(); + let engine = client.engine(); let mut new_header = Header::default(); new_header.set_number(0); // so the validator set doesn't look for a log From cff8e2f6885559e138d956f8f7e8d7cdca35a6e4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 5 Nov 2024 21:18:12 +0100 Subject: [PATCH 07/11] cargo fix --lib -p parity-rpc --- crates/rpc/src/v1/helpers/mod.rs | 1 - crates/rpc/src/v1/types/mod.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/rpc/src/v1/helpers/mod.rs b/crates/rpc/src/v1/helpers/mod.rs index 686ec7738..a9f4d4f2e 100644 --- a/crates/rpc/src/v1/helpers/mod.rs +++ b/crates/rpc/src/v1/helpers/mod.rs @@ -40,7 +40,6 @@ mod subscription_manager; mod work; pub use self::{ - dispatch::{Dispatcher, FullDispatcher}, network_settings::NetworkSettings, poll_filter::{limit_logs, PollFilter, SyncPollFilter}, poll_manager::PollManager, diff --git a/crates/rpc/src/v1/types/mod.rs b/crates/rpc/src/v1/types/mod.rs index df1e7d535..255065a5a 100644 --- a/crates/rpc/src/v1/types/mod.rs +++ b/crates/rpc/src/v1/types/mod.rs @@ -20,7 +20,7 @@ pub use rpc_common::Bytes; pub use self::{ account_info::{AccountInfo, EthAccount, ExtAccountInfo, RecoveredAccount, StorageProof}, - block::{Block, BlockTransactions, Header, Rich, RichBlock, RichHeader}, + block::{Block, BlockTransactions, Header, RichBlock, RichHeader}, block_number::{block_number_to_id, BlockNumber}, call_request::CallRequest, confirmations::{ @@ -41,13 +41,13 @@ pub use self::{ rpc_settings::RpcSettings, secretstore::EncryptedDocumentKey, sync::{ - ChainStatus, EthProtocolInfo, PeerInfo, PeerNetworkInfo, PeerProtocolsInfo, Peers, + ChainStatus, Peers, SyncInfo, SyncStatus, TransactionStats, }, trace::{LocalizedTrace, TraceResults, TraceResultsWithTransactionHash}, trace_filter::TraceFilter, transaction::{LocalTransactionStatus, RichRawTransaction, Transaction}, - transaction_access_list::{AccessList, AccessListItem}, + transaction_access_list::{AccessList}, transaction_condition::TransactionCondition, transaction_request::TransactionRequest, work::Work, From 0fd1bafa928f3bb02b3115604ee96bd3a1b009f0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Nov 2024 23:30:28 +0100 Subject: [PATCH 08/11] cargo fix --- crates/accounts/ethstore/src/account/mod.rs | 2 +- crates/accounts/ethstore/src/json/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/accounts/ethstore/src/account/mod.rs b/crates/accounts/ethstore/src/account/mod.rs index b1757474f..ceb8116ac 100644 --- a/crates/accounts/ethstore/src/account/mod.rs +++ b/crates/accounts/ethstore/src/account/mod.rs @@ -23,7 +23,7 @@ mod version; pub use self::{ cipher::{Aes128Ctr, Cipher}, crypto::Crypto, - kdf::{Kdf, Pbkdf2, Prf, Scrypt}, + kdf::{Kdf, Pbkdf2, Prf}, safe_account::SafeAccount, version::Version, }; diff --git a/crates/accounts/ethstore/src/json/mod.rs b/crates/accounts/ethstore/src/json/mod.rs index 02614eaea..d9a5c7f3e 100644 --- a/crates/accounts/ethstore/src/json/mod.rs +++ b/crates/accounts/ethstore/src/json/mod.rs @@ -32,13 +32,13 @@ mod version; pub use self::{ bytes::Bytes, cipher::{Aes128Ctr, Cipher, CipherSer, CipherSerParams}, - crypto::{CipherText, Crypto}, + crypto::{Crypto}, error::Error, hash::{H128, H160, H256}, id::Uuid, kdf::{Kdf, KdfSer, KdfSerParams, Pbkdf2, Prf, Scrypt}, key_file::{KeyFile, OpaqueKeyFile}, - presale::{Encseed, PresaleWallet}, + presale::{PresaleWallet}, vault_file::VaultFile, vault_key_file::{ insert_vault_name_to_json_meta, remove_vault_name_from_json_meta, VaultKeyFile, From 5ef8a348f91293b2bdfe9209944cbb47997f190a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 7 Nov 2024 08:51:44 +0100 Subject: [PATCH 09/11] formatted imports --- crates/accounts/ethstore/src/json/mod.rs | 4 ++-- crates/concensus/ethash/src/keccak.rs | 4 +--- .../ethcore/src/engines/hbbft/contracts/keygen_history.rs | 5 +---- crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs | 4 +--- crates/rpc/src/v1/types/mod.rs | 7 ++----- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/crates/accounts/ethstore/src/json/mod.rs b/crates/accounts/ethstore/src/json/mod.rs index d9a5c7f3e..27d2c994e 100644 --- a/crates/accounts/ethstore/src/json/mod.rs +++ b/crates/accounts/ethstore/src/json/mod.rs @@ -32,13 +32,13 @@ mod version; pub use self::{ bytes::Bytes, cipher::{Aes128Ctr, Cipher, CipherSer, CipherSerParams}, - crypto::{Crypto}, + crypto::Crypto, error::Error, hash::{H128, H160, H256}, id::Uuid, kdf::{Kdf, KdfSer, KdfSerParams, Pbkdf2, Prf, Scrypt}, key_file::{KeyFile, OpaqueKeyFile}, - presale::{PresaleWallet}, + presale::PresaleWallet, vault_file::VaultFile, vault_key_file::{ insert_vault_name_to_json_meta, remove_vault_name_from_json_meta, VaultKeyFile, diff --git a/crates/concensus/ethash/src/keccak.rs b/crates/concensus/ethash/src/keccak.rs index 187e16b85..d3dbf1be9 100644 --- a/crates/concensus/ethash/src/keccak.rs +++ b/crates/concensus/ethash/src/keccak.rs @@ -29,7 +29,5 @@ pub mod keccak_512 { pub mod keccak_256 { use super::hash; - pub use self::hash::{ - keccak256 as inplace, keccak_256 as write, - }; + pub use self::hash::{keccak256 as inplace, keccak_256 as write}; } diff --git a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs index 26e7a5e2c..80167b4c0 100644 --- a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs +++ b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs @@ -1,8 +1,5 @@ use client::traits::EngineClient; -use crypto::{ - self, - publickey::{Public}, -}; +use crypto::{self, publickey::Public}; use engines::{ hbbft::{ contracts::validator_set::{get_validator_pubkeys, ValidatorType}, diff --git a/crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs b/crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs index a04a8ac11..d219ad4f7 100644 --- a/crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs +++ b/crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs @@ -9,12 +9,10 @@ use crate::{ ethereum::public_key_to_address::public_key_to_address, }; +use super::{contracts::staking::get_pool_public_key, NodeId}; use bytes::ToPretty; - use ethereum_types::Address; -use super::{contracts::staking::get_pool_public_key, NodeId}; - #[derive(Clone, Debug)] struct ValidatorConnectionData { // mining_address: Address, diff --git a/crates/rpc/src/v1/types/mod.rs b/crates/rpc/src/v1/types/mod.rs index 255065a5a..de7478bba 100644 --- a/crates/rpc/src/v1/types/mod.rs +++ b/crates/rpc/src/v1/types/mod.rs @@ -40,14 +40,11 @@ pub use self::{ receipt::Receipt, rpc_settings::RpcSettings, secretstore::EncryptedDocumentKey, - sync::{ - ChainStatus, Peers, - SyncInfo, SyncStatus, TransactionStats, - }, + sync::{ChainStatus, Peers, SyncInfo, SyncStatus, TransactionStats}, trace::{LocalizedTrace, TraceResults, TraceResultsWithTransactionHash}, trace_filter::TraceFilter, transaction::{LocalTransactionStatus, RichRawTransaction, Transaction}, - transaction_access_list::{AccessList}, + transaction_access_list::AccessList, transaction_condition::TransactionCondition, transaction_request::TransactionRequest, work::Work, From ee62bf57e3ea52545b6245ed5d60c0e981033892 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 16 Nov 2024 20:00:26 +0100 Subject: [PATCH 10/11] fixed test imports --- crates/rpc/src/v1/tests/mocked/signing.rs | 5 +++-- crates/rpc/src/v1/types/transaction.rs | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/rpc/src/v1/tests/mocked/signing.rs b/crates/rpc/src/v1/tests/mocked/signing.rs index a1a234605..0febdcb28 100644 --- a/crates/rpc/src/v1/tests/mocked/signing.rs +++ b/crates/rpc/src/v1/tests/mocked/signing.rs @@ -16,12 +16,12 @@ use std::{str::FromStr, sync::Arc, thread, time::Duration}; -use jsonrpc_core::{futures::Future, IoHandler, Success}; +use jsonrpc_core::{futures::Future, IoHandler, Success}; use v1::{ helpers::{ dispatch, external_signer::{SignerService, SigningQueue}, - nonce, FullDispatcher, + nonce, }, impls::SigningQueueClient, metadata::Metadata, @@ -39,6 +39,7 @@ use parity_runtime::{Executor, Runtime}; use parking_lot::Mutex; use serde_json; use types::transaction::{Action, SignedTransaction, Transaction, TypedTransaction}; +use crate::dispatch::FullDispatcher; struct SigningTester { pub runtime: Runtime, diff --git a/crates/rpc/src/v1/types/transaction.rs b/crates/rpc/src/v1/types/transaction.rs index 220a701a9..85231b7f4 100644 --- a/crates/rpc/src/v1/types/transaction.rs +++ b/crates/rpc/src/v1/types/transaction.rs @@ -360,11 +360,12 @@ impl LocalTransactionStatus { #[cfg(test)] mod tests { + use crate::v1::types::transaction_access_list::AccessListItem; + use super::{LocalTransactionStatus, Transaction}; use ethereum_types::H256; use serde_json; use types::transaction::TypedTxId; - use v1::types::AccessListItem; #[test] fn test_transaction_serialize() { From 474a28f14ba832f54ba8588deed87a2fa977850d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 17 Nov 2024 11:02:21 +0100 Subject: [PATCH 11/11] cargo fmt --all -- --config imports_granularity=Crate --- crates/rpc/src/v1/tests/mocked/signing.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/rpc/src/v1/tests/mocked/signing.rs b/crates/rpc/src/v1/tests/mocked/signing.rs index 0febdcb28..64adfbf54 100644 --- a/crates/rpc/src/v1/tests/mocked/signing.rs +++ b/crates/rpc/src/v1/tests/mocked/signing.rs @@ -16,7 +16,7 @@ use std::{str::FromStr, sync::Arc, thread, time::Duration}; -use jsonrpc_core::{futures::Future, IoHandler, Success}; +use jsonrpc_core::{futures::Future, IoHandler, Success}; use v1::{ helpers::{ dispatch, @@ -30,6 +30,7 @@ use v1::{ types::{ConfirmationResponse, RichRawTransaction}, }; +use crate::dispatch::FullDispatcher; use accounts::AccountProvider; use bytes::ToPretty; use crypto::publickey::{Generator, Random, Secret}; @@ -39,7 +40,6 @@ use parity_runtime::{Executor, Runtime}; use parking_lot::Mutex; use serde_json; use types::transaction::{Action, SignedTransaction, Transaction, TypedTransaction}; -use crate::dispatch::FullDispatcher; struct SigningTester { pub runtime: Runtime,