From 88a8516b98b686be4edb1319257e288799410973 Mon Sep 17 00:00:00 2001 From: lean-apple <78718413+lean-apple@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:06:14 +0100 Subject: [PATCH] fix: resolve merge conflicts in and cache mod --- crates/rpc/rpc-eth-types/src/cache/mod.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/rpc/rpc-eth-types/src/cache/mod.rs b/crates/rpc/rpc-eth-types/src/cache/mod.rs index 60ff2309da37..0ced498ce10a 100644 --- a/crates/rpc/rpc-eth-types/src/cache/mod.rs +++ b/crates/rpc/rpc-eth-types/src/cache/mod.rs @@ -575,8 +575,9 @@ impl ChainChange { /// immediately before they need to be fetched from disk. /// /// Updates [`EthStateCache`] in two scenario : -/// 1. On reorgs: sets [`latest_chain_change`] to None and removes reorged blocks -/// 2. On new canonical blocks: updates [`latest_chain_change`] and caches the new blocks +/// 1. On reorgs: sets `EthStateCache::latest_chain_change` to None and removes reorged blocks +/// 2. On new canonical blocks: updates `EthStateCache::latest_chain_change` and caches the new +/// blocks /// /// Reorged blocks are removed from the cache. pub async fn cache_new_blocks_task(