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

style: prefer then_some over if else (#1810)

Browse Source
This commit is contained in:
Roman Krasiuk
2023-03-17 15:16:29 +02:00
committed by GitHub
parent ef51f566fe
commit 9036f5ea9f
7 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/reth/src/test_eth_chain/runner.rs
View File

@ -152,7 +152,7 @@ pub async fn run_test(path: PathBuf) -> eyre::Result<TestOutcome> {
pre_state.into_iter().try_for_each(|(address, account)| -> eyre::Result<()> { pre_state.into_iter().try_for_each(|(address, account)| -> eyre::Result<()> {
let has_code = !account.code.is_empty(); let has_code = !account.code.is_empty();
let code_hash = if has_code { Some(keccak256(&account.code)) } else { None }; let code_hash = has_code.then(|| keccak256(&account.code));
tx.put::<tables::PlainAccountState>( tx.put::<tables::PlainAccountState>(
address, address,
RethAccount { RethAccount {

2
crates/executor/src/executor.rs
View File

@ -573,7 +573,7 @@ mod tests {
Ok(self Ok(self
.block_hash .block_hash
.iter() .iter()
.filter_map(|(block, hash)| if range.contains(block) { Some(*hash) } else { None }) .filter_map(|(block, hash)| range.contains(block).then_some(*hash))
.collect()) .collect())
} }
} }

6
crates/metrics/metrics-derive/tests/metrics.rs
View File

@ -303,21 +303,21 @@ impl Recorder for TestRecorder {
fn register_counter(&self, key: &Key) -> Counter { fn register_counter(&self, key: &Key) -> Counter {
let labels_vec: Vec<Label> = key.labels().cloned().collect(); let labels_vec: Vec<Label> = key.labels().cloned().collect();
let labels = if labels_vec.is_empty() { None } else { Some(labels_vec) }; let labels = (!labels_vec.is_empty()).then_some(labels_vec);
self.record_metric(key.name(), TestMetricTy::Counter, None, labels); self.record_metric(key.name(), TestMetricTy::Counter, None, labels);
Counter::noop() Counter::noop()
} }
fn register_gauge(&self, key: &Key) -> Gauge { fn register_gauge(&self, key: &Key) -> Gauge {
let labels_vec: Vec<Label> = key.labels().cloned().collect(); let labels_vec: Vec<Label> = key.labels().cloned().collect();
let labels = if labels_vec.is_empty() { None } else { Some(labels_vec) }; let labels = (!labels_vec.is_empty()).then_some(labels_vec);
self.record_metric(key.name(), TestMetricTy::Gauge, None, labels); self.record_metric(key.name(), TestMetricTy::Gauge, None, labels);
Gauge::noop() Gauge::noop()
} }
fn register_histogram(&self, key: &Key) -> Histogram { fn register_histogram(&self, key: &Key) -> Histogram {
let labels_vec: Vec<Label> = key.labels().cloned().collect(); let labels_vec: Vec<Label> = key.labels().cloned().collect();
let labels = if labels_vec.is_empty() { None } else { Some(labels_vec) }; let labels = (!labels_vec.is_empty()).then_some(labels_vec);
self.record_metric(key.name(), TestMetricTy::Histogram, None, labels); self.record_metric(key.name(), TestMetricTy::Histogram, None, labels);
Histogram::noop() Histogram::noop()
} }

2
crates/revm/revm-primitives/src/compat.rs
View File

@ -29,6 +29,6 @@ pub fn to_reth_acc(revm_acc: &AccountInfo) -> Account {
Account { Account {
balance: revm_acc.balance, balance: revm_acc.balance,
nonce: revm_acc.nonce, nonce: revm_acc.nonce,
bytecode_hash: if code_hash == KECCAK_EMPTY { None } else { Some(code_hash) }, bytecode_hash: (code_hash != KECCAK_EMPTY).then_some(code_hash),
} }
} }

3
crates/rpc/rpc/src/eth/api/server.rs
View File

@ -446,8 +446,7 @@ mod tests {
let hash = H256::random(); let hash = H256::random();
let gas_limit: u64 = random(); let gas_limit: u64 = random();
let gas_used: u64 = random(); let gas_used: u64 = random();
let base_fee_per_gas: Option<u64> = let base_fee_per_gas: Option<u64> = random::<bool>().then(|| random());
if random::<bool>() { Some(random()) } else { None };
let header = Header { let header = Header {
number: newest_block - i, number: newest_block - i,

3
crates/rpc/rpc/src/eth/filter.rs
View File

@ -202,8 +202,7 @@ where
let mut all_logs = Vec::new(); let mut all_logs = Vec::new();
let filter_params = FilteredParams::new(Some(filter.clone())); let filter_params = FilteredParams::new(Some(filter.clone()));
let topics = let topics = filter.has_topics().then(|| filter_params.flat_topics.clone());
if filter.has_topics() { Some(filter_params.flat_topics.clone()) } else { None };
// derive bloom filters from filter input // derive bloom filters from filter input
let address_filter = FilteredParams::address_filter(&filter.address); let address_filter = FilteredParams::address_filter(&filter.address);

5
crates/storage/provider/src/test_utils/mock.rs
View File

@ -179,8 +179,7 @@ impl BlockHashProvider for MockEthProvider {
fn block_hash(&self, number: u64) -> Result<Option<H256>> { fn block_hash(&self, number: u64) -> Result<Option<H256>> {
let lock = self.blocks.lock(); let lock = self.blocks.lock();
let hash = let hash = lock.iter().find_map(|(hash, b)| (b.number == number).then_some(*hash));
lock.iter().find_map(|(hash, b)| if b.number == number { Some(*hash) } else { None });
Ok(hash) Ok(hash)
} }
@ -213,7 +212,7 @@ impl BlockIdProvider for MockEthProvider {
fn block_number(&self, hash: H256) -> Result<Option<reth_primitives::BlockNumber>> { fn block_number(&self, hash: H256) -> Result<Option<reth_primitives::BlockNumber>> {
let lock = self.blocks.lock(); let lock = self.blocks.lock();
let num = lock.iter().find_map(|(h, b)| if *h == hash { Some(b.number) } else { None }); let num = lock.iter().find_map(|(h, b)| (*h == hash).then_some(b.number));
Ok(num) Ok(num)
} }
} }