From fa0c1efb8dedaf8837eac2cc581c6357cd73f35f Mon Sep 17 00:00:00 2001 From: David Date: Wed, 19 Feb 2020 16:12:27 +0100 Subject: [PATCH] Grab bag of cleanup (#11504) Formatting, docs, pass TransactOptions instead of tracers. --- ethcore/db/src/cache_manager.rs | 6 ++-- ethcore/executive-state/src/lib.rs | 15 ++++---- ethcore/src/test_helpers/evm_test_client.rs | 3 +- ethcore/trace/src/config.rs | 4 +-- ethcore/trace/src/db.rs | 39 +++++++++++---------- 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/ethcore/db/src/cache_manager.rs b/ethcore/db/src/cache_manager.rs index b08f4c0bc..cd3b037ae 100644 --- a/ethcore/db/src/cache_manager.rs +++ b/ethcore/db/src/cache_manager.rs @@ -33,9 +33,9 @@ impl CacheManager where T: Eq + Hash { /// Create new cache manager with preferred (heap) sizes. pub fn new(pref_cache_size: usize, max_cache_size: usize, bytes_per_cache_entry: usize) -> Self { CacheManager { - pref_cache_size: pref_cache_size, - max_cache_size: max_cache_size, - bytes_per_cache_entry: bytes_per_cache_entry, + pref_cache_size, + max_cache_size, + bytes_per_cache_entry, cache_usage: (0..COLLECTION_QUEUE_SIZE).into_iter().map(|_| Default::default()).collect(), } } diff --git a/ethcore/executive-state/src/lib.rs b/ethcore/executive-state/src/lib.rs index a2f979b10..cf121c168 100644 --- a/ethcore/executive-state/src/lib.rs +++ b/ethcore/executive-state/src/lib.rs @@ -154,13 +154,12 @@ pub trait ExecutiveState { /// Execute a given transaction with given tracer and VM tracer producing a receipt and an optional trace. /// This will change the state accordingly. - fn apply_with_tracing( + fn apply_with_tracing( &mut self, env_info: &EnvInfo, machine: &Machine, t: &SignedTransaction, - tracer: T, - vm_tracer: V, + options: TransactOptions, ) -> ApplyResult where T: trace::Tracer, @@ -179,28 +178,26 @@ impl ExecutiveState for State { ) -> ApplyResult { if tracing { let options = TransactOptions::with_tracing(); - self.apply_with_tracing(env_info, machine, t, options.tracer, options.vm_tracer) + self.apply_with_tracing(env_info, machine, t, options) } else { let options = TransactOptions::with_no_tracing(); - self.apply_with_tracing(env_info, machine, t, options.tracer, options.vm_tracer) + self.apply_with_tracing(env_info, machine, t, options) } } /// Execute a given transaction with given tracer and VM tracer producing a receipt and an optional trace. /// This will change the state accordingly. - fn apply_with_tracing( + fn apply_with_tracing( &mut self, env_info: &EnvInfo, machine: &Machine, t: &SignedTransaction, - tracer: T, - vm_tracer: V, + options: TransactOptions ) -> ApplyResult where T: trace::Tracer, V: trace::VMTracer, { - let options = TransactOptions::new(tracer, vm_tracer); let e = execute(self, env_info, machine, t, options, false)?; let params = machine.params(); diff --git a/ethcore/src/test_helpers/evm_test_client.rs b/ethcore/src/test_helpers/evm_test_client.rs index 252de7dbc..8769af2e8 100644 --- a/ethcore/src/test_helpers/evm_test_client.rs +++ b/ethcore/src/test_helpers/evm_test_client.rs @@ -271,7 +271,8 @@ impl<'a> EvmTestClient<'a> { } // Apply transaction - let result = self.state.apply_with_tracing(&env_info, self.spec.engine.machine(), &transaction, tracer, vm_tracer); + let trace_opts = executive::TransactOptions::new(tracer, vm_tracer); + let result = self.state.apply_with_tracing(&env_info, self.spec.engine.machine(), &transaction, trace_opts); let scheme = CreateContractAddress::FromSenderAndNonce; // Touch the coinbase at the end of the test to simulate diff --git a/ethcore/trace/src/config.rs b/ethcore/trace/src/config.rs index 596303697..5073a88af 100644 --- a/ethcore/trace/src/config.rs +++ b/ethcore/trace/src/config.rs @@ -22,9 +22,9 @@ pub struct Config { /// Indicates if tracing should be enabled or not. /// If it's None, it will be automatically configured. pub enabled: bool, - /// Preferred cache-size. + /// Preferred cache-size (default: 15Mb). pub pref_cache_size: usize, - /// Max cache-size. + /// Max cache-size (default: 20Mb). pub max_cache_size: usize, } diff --git a/ethcore/trace/src/db.rs b/ethcore/trace/src/db.rs index 4de60272c..ac887ebbe 100644 --- a/ethcore/trace/src/db.rs +++ b/ethcore/trace/src/db.rs @@ -239,13 +239,15 @@ impl TraceDatabase for TraceDB where T: DatabaseExtras { let enacted_blooms: Vec<_> = request.enacted .iter() // all traces are expected to be found here. That's why `expect` has been used - // instead of `filter_map`. If some traces haven't been found, it meens that + // instead of `filter_map`. If some traces haven't been found, it means that // traces database is corrupted or incomplete. - .map(|block_hash| if block_hash == &request.block_hash { - request.traces.bloom() - } else { - self.traces(block_hash).expect("Traces database is incomplete.").bloom() - }) + .map(|block_hash| + if block_hash == &request.block_hash { + request.traces.bloom() + } else { + self.traces(block_hash).expect("Traces database is incomplete.").bloom() + } + ) .collect(); self.db.trace_blooms() @@ -298,18 +300,19 @@ impl TraceDatabase for TraceDB where T: DatabaseExtras { let tx_hash = self.extras.transaction_hash(block_number, tx_position) .expect("Expected to find transaction hash. Database is probably corrupted"); - traces.into_iter() - .map(|trace| LocalizedTrace { - action: trace.action, - result: trace.result, - subtraces: trace.subtraces, - trace_address: trace.trace_address.into_iter().collect(), - transaction_number: Some(tx_position), - transaction_hash: Some(tx_hash.clone()), - block_number, - block_hash, - }) - .collect() + traces + .into_iter() + .map(|trace| LocalizedTrace { + action: trace.action, + result: trace.result, + subtraces: trace.subtraces, + trace_address: trace.trace_address.into_iter().collect(), + transaction_number: Some(tx_position), + transaction_hash: Some(tx_hash.clone()), + block_number, + block_hash, + }) + .collect() }) ) }