chore: remove some unnecessary calls to unwrap/expect
#6727
Conversation
DaniPopes
requested review from
shekhirin,
joshieDo,
mattsse,
Rjected,
rakita,
emhane and
gakonst
as code owners
DaniPopes
force-pushed
the
dani/remove-expects
branch
from
3158b06
to
0ddf810
Compare
| // Insert a new peer into the peerset. | ||
| let peer = Peer::new(messages, version, client_version); | ||
| let peer = match self.peers.entry(peer_id) { | ||
| Entry::Occupied(mut entry) => { | ||
| entry.insert(peer); | ||
| entry.into_mut() |
There was a problem hiding this comment.
this is the only logic change, to add the peer even if we are syncing, not sure what the motivation is behind this? found the call, my bad
| @@ -350,7 +350,8 @@ where | |||
| transaction: Self::Transaction, | |||
| ) -> PoolResult<TxHash> { | |||
| let (_, tx) = self.validate(origin, transaction).await; | |||
| self.pool.add_transactions(origin, std::iter::once(tx)).pop().expect("exists; qed") | |||
| let mut results = self.pool.add_transactions(origin, std::iter::once(tx)); | |||
| results.pop().expect("result length is the same as the input") | |||
There was a problem hiding this comment.
not sure what this error message means, where are we guaranteed that transactions ins't zero? anyhow out of scope of this pr probably
There was a problem hiding this comment.
add_transaction takes in an iterator, the output is a Vec<Result<_>> collected from the iterator so it has the same length
| } else { | ||
| let jar = NippyJar::load(&self.path.join(segment.filename(block_range, tx_range))) | ||
| .map(|jar| { | ||
| let entry = match self.map.entry(key) { |
There was a problem hiding this comment.
i think this would acquire a lock which is not desirable
https://docs.rs/dashmap/latest/dashmap/struct.DashMap.html#method.entry
while get allows this to be returned with reduced deadlock risk
https://docs.rs/dashmap/latest/dashmap/struct.DashMap.html#method.get
There was a problem hiding this comment.
so does calling get twice no?
Mostly using
entryandinsert*APIs to avoid double lookups in maps andunwrap/expectin options.Also some cleanups along the way.