From 8aab926e39f6e81ccf6588d99b12776623fc29d6 Mon Sep 17 00:00:00 2001 From: aniketfuryrocks Date: Thu, 2 Feb 2023 18:10:02 +0530 Subject: [PATCH] merge --- src/workers/block_listenser.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/workers/block_listenser.rs b/src/workers/block_listenser.rs index 427d57cd..280b6a56 100644 --- a/src/workers/block_listenser.rs +++ b/src/workers/block_listenser.rs @@ -164,18 +164,12 @@ impl BlockListener { let parent_slot = block.parent_slot; -<<<<<<< HEAD - self.block_store - .insert(blockhash, BlockInformation { slot, block_height }); - *self.latest_block_hash.write().await = blockhash.clone(); -======= // Write to block store first in order to prevent // any race condition i.e prevent some one to // ask the map what it doesn't have rn self.block_store .insert(blockhash.clone(), BlockInformation { slot, block_height }); *self.latest_block_hash.write().await = blockhash; ->>>>>>> fix_block_race_condition if let Some(postgres) = &postgres { let Some(rewards) = block.rewards else {