chore(clippy): enable if_then_some_else_none lint (#11679)

Signed-off-by: jsvisa <delweng@gmail.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Delweng
2024-10-14 23:45:26 +08:00
committed by GitHub
parent 523bfb9c81
commit f684dd4c4c
22 changed files with 87 additions and 135 deletions

View File

@ -212,14 +212,12 @@ where
let block = payload.block();
let cancun_fields =
if self.provider.chain_spec().is_cancun_active_at_timestamp(block.timestamp) {
Some(CancunPayloadFields {
self.provider.chain_spec().is_cancun_active_at_timestamp(block.timestamp).then(|| {
CancunPayloadFields {
parent_beacon_block_root: block.parent_beacon_block_root.unwrap(),
versioned_hashes: block.blob_versioned_hashes().into_iter().copied().collect(),
})
} else {
None
};
}
});
let (tx, rx) = oneshot::channel();
self.to_engine.send(BeaconEngineMessage::NewPayload {

View File

@ -31,16 +31,14 @@ where
timestamp,
prev_randao: B256::random(),
suggested_fee_recipient: Address::random(),
withdrawals: if self.chain_spec.is_shanghai_active_at_timestamp(timestamp) {
Some(Default::default())
} else {
None
},
parent_beacon_block_root: if self.chain_spec.is_cancun_active_at_timestamp(timestamp) {
Some(B256::random())
} else {
None
},
withdrawals: self
.chain_spec
.is_shanghai_active_at_timestamp(timestamp)
.then(Default::default),
parent_beacon_block_root: self
.chain_spec
.is_cancun_active_at_timestamp(timestamp)
.then(B256::random),
}
}
}