Fix warnings: unnecessary mut

This commit is contained in:
adria0 2020-07-29 11:00:04 +02:00 committed by Artem Vorotnikov
parent cacbf256fe
commit c5aed5bab1
No known key found for this signature in database
GPG Key ID: E0148C3F2FBB7A20
11 changed files with 68 additions and 68 deletions

View File

@ -1481,7 +1481,7 @@ mod tests {
ext.tracing = true; ext.tracing = true;
let gas_left = { let gas_left = {
let mut vm = interpreter(params, &ext); let vm = interpreter(params, &ext);
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -1503,7 +1503,7 @@ mod tests {
ext.tracing = true; ext.tracing = true;
let err = { let err = {
let mut vm = interpreter(params, &ext); let vm = interpreter(params, &ext);
test_finalize(vm.exec(&mut ext).ok().unwrap()) test_finalize(vm.exec(&mut ext).ok().unwrap())
.err() .err()
.unwrap() .unwrap()

View File

@ -44,7 +44,7 @@ fn test_add(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -68,7 +68,7 @@ fn test_sha3(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -92,7 +92,7 @@ fn test_address(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -118,7 +118,7 @@ fn test_origin(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -174,7 +174,7 @@ fn test_sender(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -238,7 +238,7 @@ fn test_extcodecopy(factory: super::Factory) {
ext.codes.insert(sender, Arc::new(sender_code)); ext.codes.insert(sender, Arc::new(sender_code));
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -262,7 +262,7 @@ fn test_log_empty(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -294,7 +294,7 @@ fn test_log_sender(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -328,7 +328,7 @@ fn test_blockhash(factory: super::Factory) {
ext.blockhashes.insert(U256::zero(), blockhash.clone()); ext.blockhashes.insert(U256::zero(), blockhash.clone());
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -352,7 +352,7 @@ fn test_calldataload(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -376,7 +376,7 @@ fn test_author(factory: super::Factory) {
ext.info.author = author; ext.info.author = author;
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -400,7 +400,7 @@ fn test_timestamp(factory: super::Factory) {
ext.info.timestamp = timestamp; ext.info.timestamp = timestamp;
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -424,7 +424,7 @@ fn test_number(factory: super::Factory) {
ext.info.number = number; ext.info.number = number;
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -448,7 +448,7 @@ fn test_difficulty(factory: super::Factory) {
ext.info.difficulty = difficulty; ext.info.difficulty = difficulty;
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -472,7 +472,7 @@ fn test_gas_limit(factory: super::Factory) {
ext.info.gas_limit = gas_limit; ext.info.gas_limit = gas_limit;
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -494,7 +494,7 @@ fn test_mul(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -516,7 +516,7 @@ fn test_sub(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -538,7 +538,7 @@ fn test_div(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -560,7 +560,7 @@ fn test_div_zero(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -584,7 +584,7 @@ fn test_mod(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -613,7 +613,7 @@ fn test_smod(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -642,7 +642,7 @@ fn test_sdiv(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -671,7 +671,7 @@ fn test_exp(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -705,7 +705,7 @@ fn test_comparison(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -744,7 +744,7 @@ fn test_signed_comparison(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -783,7 +783,7 @@ fn test_bitops(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -832,7 +832,7 @@ fn test_addmod_mulmod(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -869,7 +869,7 @@ fn test_byte(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -896,7 +896,7 @@ fn test_signextend(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -924,7 +924,7 @@ fn test_badinstruction_int() {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let err = { let err = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err()
}; };
@ -944,7 +944,7 @@ fn test_pop(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -970,7 +970,7 @@ fn test_extops(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -1019,7 +1019,7 @@ fn test_jumps(factory: super::Factory) {
let mut ext = FakeExt::new(); let mut ext = FakeExt::new();
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -1055,7 +1055,7 @@ fn test_calls(factory: super::Factory) {
}; };
let gas_left = { let gas_left = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -1102,7 +1102,7 @@ fn test_create_in_staticcall(factory: super::Factory) {
ext.is_static = true; ext.is_static = true;
let err = { let err = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err()
}; };
@ -1414,7 +1414,7 @@ fn push_two_pop_one_constantinople_test(
let mut ext = FakeExt::new_constantinople(); let mut ext = FakeExt::new_constantinople();
let _ = { let _ = {
let mut vm = factory.create(params, ext.schedule(), ext.depth()); let vm = factory.create(params, ext.schedule(), ext.depth());
test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
}; };

View File

@ -302,7 +302,7 @@ impl Importer {
) = { ) = {
let mut imported_blocks = Vec::with_capacity(max_blocks_to_import); let mut imported_blocks = Vec::with_capacity(max_blocks_to_import);
let mut invalid_blocks = HashSet::new(); let mut invalid_blocks = HashSet::new();
let mut proposed_blocks = Vec::with_capacity(max_blocks_to_import); let proposed_blocks = Vec::with_capacity(max_blocks_to_import);
let mut import_results = Vec::with_capacity(max_blocks_to_import); let mut import_results = Vec::with_capacity(max_blocks_to_import);
let _import_lock = self.import_lock.lock(); let _import_lock = self.import_lock.lock();

View File

@ -294,7 +294,7 @@ impl Clique {
"Back-filling block state. last_checkpoint_number: {}, target: {}({}).", "Back-filling block state. last_checkpoint_number: {}, target: {}({}).",
last_checkpoint_number, header.number(), header.hash()); last_checkpoint_number, header.number(), header.hash());
let mut chain: &mut VecDeque<Header> = &mut VecDeque::with_capacity( let chain: &mut VecDeque<Header> = &mut VecDeque::with_capacity(
(header.number() - last_checkpoint_number + 1) as usize, (header.number() - last_checkpoint_number + 1) as usize,
); );

View File

@ -308,7 +308,7 @@ impl Engine<EthereumMachine> for Arc<Ethash> {
let n_uncles = block.uncles.len(); let n_uncles = block.uncles.len();
// Bestow block rewards. // Bestow block rewards.
let mut result_block_reward = reward + reward.shr(5) * U256::from(n_uncles); let result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
rewards.push((author, RewardKind::Author, result_block_reward)); rewards.push((author, RewardKind::Author, result_block_reward));

View File

@ -325,7 +325,7 @@ fn do_json_test_for<H: FnMut(&str, HookType)>(
&mut tracer, &mut tracer,
&mut vm_tracer, &mut vm_tracer,
)); ));
let mut evm = vm_factory.create(params, &schedule, 0); let evm = vm_factory.create(params, &schedule, 0);
let res = evm let res = evm
.exec(&mut ex) .exec(&mut ex)
.ok() .ok()

View File

@ -911,13 +911,13 @@ mod tests {
let mut parent_hash = H256::zero(); let mut parent_hash = H256::zero();
for i in 0..4 { for i in 0..4 {
// Construct the block body // Construct the block body
let mut uncles = if i > 0 { let uncles = if i > 0 {
encode_list(&[dummy_header(i - 1, H256::random())]) encode_list(&[dummy_header(i - 1, H256::random())])
} else { } else {
::rlp::EMPTY_LIST_RLP.to_vec() ::rlp::EMPTY_LIST_RLP.to_vec()
}; };
let mut txs = encode_list(&[dummy_signed_tx()]); let txs = encode_list(&[dummy_signed_tx()]);
let tx_root = ordered_trie_root(Rlp::new(&txs).iter().map(|r| r.as_raw())); let tx_root = ordered_trie_root(Rlp::new(&txs).iter().map(|r| r.as_raw()));
let mut rlp = RlpStream::new_list(2); let mut rlp = RlpStream::new_list(2);
@ -988,7 +988,7 @@ mod tests {
// //
// The RLP-encoded integers are clearly not receipts, but the BlockDownloader treats // The RLP-encoded integers are clearly not receipts, but the BlockDownloader treats
// all receipts as byte blobs, so it does not matter. // all receipts as byte blobs, so it does not matter.
let mut receipts_rlp = if i < 2 { let receipts_rlp = if i < 2 {
encode_list(&[0u32]) encode_list(&[0u32])
} else { } else {
encode_list(&[i as u32]) encode_list(&[i as u32])

View File

@ -48,7 +48,7 @@ macro_rules! reqrep_test {
fake_ext.info = $info; fake_ext.info = $info;
fake_ext.blockhashes = $block_hashes; fake_ext.blockhashes = $block_hashes;
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
interpreter interpreter
.exec(&mut fake_ext) .exec(&mut fake_ext)
.ok() .ok()
@ -91,7 +91,7 @@ fn empty() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -120,7 +120,7 @@ fn logger() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -195,7 +195,7 @@ fn identity() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -238,7 +238,7 @@ fn dispersion() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -271,7 +271,7 @@ fn suicide_not() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -313,7 +313,7 @@ fn suicide() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -345,7 +345,7 @@ fn create() {
ext.schedule.wasm.as_mut().unwrap().have_create2 = true; ext.schedule.wasm.as_mut().unwrap().have_create2 = true;
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -414,7 +414,7 @@ fn call_msg() {
.insert(receiver.clone(), U256::from(10000000000u64)); .insert(receiver.clone(), U256::from(10000000000u64));
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -471,7 +471,7 @@ fn call_msg_gasleft() {
.insert(receiver.clone(), U256::from(10000000000u64)); .insert(receiver.clone(), U256::from(10000000000u64));
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -522,7 +522,7 @@ fn call_code() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -578,7 +578,7 @@ fn call_static() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -627,7 +627,7 @@ fn realloc() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -659,7 +659,7 @@ fn alloc() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -699,7 +699,7 @@ fn storage_read() {
); );
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -735,7 +735,7 @@ fn keccak() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -883,7 +883,7 @@ fn storage_metering() {
]); ]);
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -905,7 +905,7 @@ fn storage_metering() {
]); ]);
let gas_left = { let gas_left = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap() test_finalize(interpreter.exec(&mut ext).ok().unwrap()).unwrap()
}; };
@ -1064,7 +1064,7 @@ fn embedded_keccak() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()
@ -1105,7 +1105,7 @@ fn events() {
let mut ext = FakeExt::new().with_wasm(); let mut ext = FakeExt::new().with_wasm();
let (gas_left, result) = { let (gas_left, result) = {
let mut interpreter = wasm_interpreter(params); let interpreter = wasm_interpreter(params);
let result = interpreter let result = interpreter
.exec(&mut ext) .exec(&mut ext)
.ok() .ok()

View File

@ -282,7 +282,7 @@ impl<T: InformantData> Informant<T> {
let elapsed = now.duration_since(*self.last_tick.read()); let elapsed = now.duration_since(*self.last_tick.read());
let (client_report, full_report) = { let (client_report, full_report) = {
let mut last_report = self.last_report.lock(); let last_report = self.last_report.lock();
let full_report = self.target.report(); let full_report = self.target.report();
let diffed = full_report.client_report.clone() - &*last_report; let diffed = full_report.client_report.clone() - &*last_report;
(diffed, full_report) (diffed, full_report)

View File

@ -137,7 +137,7 @@ impl<P: PostSign> Future for ProspectiveSigner<P> {
); );
} }
WaitForPostSign => { WaitForPostSign => {
if let Some(mut fut) = self.post_sign_future.as_mut() { if let Some(fut) = self.post_sign_future.as_mut() {
match fut.poll()? { match fut.poll()? {
Async::Ready(item) => { Async::Ready(item) => {
let nonce = self.ready.take().expect( let nonce = self.ready.take().expect(

View File

@ -79,7 +79,7 @@ impl EncryptionInstance {
match self.0 { match self.0 {
EncryptionInner::AES(key, nonce, encode) => match encode { EncryptionInner::AES(key, nonce, encode) => match encode {
AesEncode::AppendedNonce => { AesEncode::AppendedNonce => {
let mut enc = Encryptor::aes_256_gcm(&*key).ok()?; let enc = Encryptor::aes_256_gcm(&*key).ok()?;
let mut buf = enc.encrypt(&nonce, plain.to_vec()).ok()?; let mut buf = enc.encrypt(&nonce, plain.to_vec()).ok()?;
buf.extend(&nonce[..]); buf.extend(&nonce[..]);
Some(buf) Some(buf)