jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: clippy warnings in tests (#1954)

Browse Source
This commit is contained in:
Thor
2023-03-26 04:32:55 -07:00
committed by GitHub
parent ee226fc889
commit b27a0901a0
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
crates/consensus/beacon/src/engine/mod.rs
View File

@ -551,10 +551,12 @@ mod tests {
);
let rx = spawn_consensus_engine(consensus_engine);
let _ = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
});
let _ = env
.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
})
.await;
assert_matches!(
rx.await,
Ok(Err(BeaconEngineError::Pipeline(PipelineError::Stage(StageError::ChannelClosed))))
@ -583,14 +585,16 @@ mod tests {
assert_matches!(rx.try_recv(), Err(TryRecvError::Empty));
// consensus engine is still idle
let _ = env.send_new_payload(SealedBlock::default().into());
let _ = env.send_new_payload(SealedBlock::default().into()).await;
assert_matches!(rx.try_recv(), Err(TryRecvError::Empty));
// consensus engine receives a forkchoice state and triggers the pipeline
let _ = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
});
let _ = env
.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
})
.await;
assert_matches!(
rx.await,
Ok(Err(BeaconEngineError::Pipeline(PipelineError::Stage(StageError::ChannelClosed))))
@ -619,10 +623,12 @@ mod tests {
);
let rx = spawn_consensus_engine(consensus_engine);
let _ = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
});
let _ = env
.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
})
.await;
assert_matches!(
rx.await,
@ -648,10 +654,12 @@ mod tests {
consensus_engine.max_block = Some(max_block);
let rx = spawn_consensus_engine(consensus_engine);
let _ = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
});
let _ = env
.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
..Default::default()
})
.await;
assert_matches!(rx.await, Ok(Ok(())));
}
@ -803,7 +811,7 @@ mod tests {
let block1 = random_block(1, Some(genesis.hash), None, Some(0));
insert_blocks(env.db.as_ref(), [&genesis, &block1].into_iter());
let _ = spawn_consensus_engine(consensus_engine);
let _engine = spawn_consensus_engine(consensus_engine);
let rx = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
@ -812,6 +820,7 @@ mod tests {
});
let expected_result = ForkchoiceUpdated::from_status(PayloadStatusEnum::Syncing);
assert_matches!(rx.await, Ok(Ok(result)) => assert_eq!(result, expected_result));
drop(_engine);
}
#[tokio::test]
@ -837,7 +846,7 @@ mod tests {
insert_blocks(env.db.as_ref(), [&genesis, &block1].into_iter());
let _ = spawn_consensus_engine(consensus_engine);
let _engine = spawn_consensus_engine(consensus_engine);
let rx = env.send_forkchoice_updated(ForkchoiceState {
head_block_hash: H256::random(),
@ -857,6 +866,7 @@ mod tests {
})
.with_latest_valid_hash(H256::zero());
assert_matches!(rx.await, Ok(Ok(result)) => assert_eq!(result, expected_result));
drop(_engine);
}
}

3
crates/executor/src/blockchain_tree/chain.rs
View File

@ -389,8 +389,7 @@ mod tests {
#[test]
fn test_number_split() {
let mut base_state = PostState::default();
let mut account = Account::default();
account.nonce = 10;
let account = Account { nonce: 10, ..Default::default() };
base_state.create_account(H160([1; 20]), account);
base_state.finish_transition();

2
crates/rpc/rpc-engine-api/src/engine_api.rs
View File

@ -444,7 +444,7 @@ mod tests {
assert_matches!(
result_rx.await,
Ok(Err(EngineApiError::TerminalBlockHash { execution, consensus }))
if execution == None && consensus == transition_config.terminal_block_hash
if execution.is_none() && consensus == transition_config.terminal_block_hash
);
// Add block and to provider local store and test for mismatch

2
crates/rpc/rpc-types/src/eth/engine/payload.rs
View File

@ -293,7 +293,7 @@ mod tests {
assert_matches!(TryInto::<SealedBlock>::try_into(block_with_valid_extra_data), Ok(_));
// Invalid extra data
let block_with_invalid_extra_data: Bytes = BytesMut::zeroed(33).freeze().into();
let block_with_invalid_extra_data: Bytes = BytesMut::zeroed(33).freeze();
let invalid_extra_data_block = transform_block(block.clone(), |mut b| {
b.header.extra_data = block_with_invalid_extra_data.clone().into();
b