From f5612f2a77635a8207425f394a39cef3921ba298 Mon Sep 17 00:00:00 2001
From: henridf <henridf@gmail.com>
Date: Fri, 10 Mar 2023 13:51:36 +0100
Subject: [PATCH] Remove BlobsSidecar used in BeaconChainDB (#4710)

---
 beacon_chain/beacon_chain_db.nim              | 20 +------------------
 .../gossip_processing/block_processor.nim     |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/beacon_chain/beacon_chain_db.nim b/beacon_chain/beacon_chain_db.nim
index 290d58aeb..901d875e0 100644
--- a/beacon_chain/beacon_chain_db.nim
+++ b/beacon_chain/beacon_chain_db.nim
@@ -23,7 +23,7 @@ import
   "."/[beacon_chain_db_light_client, filepath]
 
 from ./spec/datatypes/capella import BeaconState
-from ./spec/datatypes/deneb import TrustedSignedBeaconBlock, BlobsSidecar
+from ./spec/datatypes/deneb import TrustedSignedBeaconBlock
 
 export
   phase0, altair, eth2_ssz_serialization, eth2_merkleization, kvstore,
@@ -801,11 +801,6 @@ proc putBlobSidecar*(
     value: BlobSidecar) =
   db.blobs.putSZSSZ(blobkey(value.block_root, value.index), value)
 
-proc putBlobsSidecar*(
-    db: BeaconChainDB,
-    value: BlobsSidecar) =
-  db.blobs.putSZSSZ(value.beacon_block_root.data, value)
-
 proc updateImmutableValidators*(
     db: BeaconChainDB, validators: openArray[Validator]) =
   # Must be called before storing a state that references the new validators
@@ -995,12 +990,6 @@ proc getBlock*[
   else:
     result.err()
 
-proc getBlobsSidecar*(db: BeaconChainDB, key: Eth2Digest): Opt[BlobsSidecar] =
-  var blobs: BlobsSidecar
-  result.ok(blobs)
-  if db.blobs.getSZSSZ(key.data, result.get) != GetResult.found:
-    result.err()
-
 proc getBlobSidecar*(db: BeaconChainDB, root: Eth2Digest, index: BlobIndex):
                     Opt[BlobSidecar] =
   var blobs: BlobSidecar
@@ -1078,13 +1067,6 @@ proc getBlockSSZ*(
   of ConsensusFork.Deneb:
     getBlockSSZ(db, key, data, deneb.TrustedSignedBeaconBlock)
 
-proc getBlobsSidecarSZ*(db: BeaconChainDB, key: Eth2Digest, data: var seq[byte]):
-    bool =
-  let dataPtr = addr data # Short-lived
-  func decode(data: openArray[byte]) =
-    assign(dataPtr[], data)
-  db.blobs.get(key.data, decode).expectDb()
-
 proc getBlobSidecarSZ*(db: BeaconChainDB, root: Eth2Digest, index: BlobIndex,
                        data: var seq[byte]):
     bool =
diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
index d253b2433..8e2981f6d 100644
--- a/beacon_chain/gossip_processing/block_processor.nim
+++ b/beacon_chain/gossip_processing/block_processor.nim
@@ -26,7 +26,6 @@ from ../consensus_object_pools/block_quarantine import
 from ../validators/validator_monitor import
   MsgSource, ValidatorMonitor, registerAttestationInBlock, registerBeaconBlock,
   registerSyncAggregateInBlock
-from ../spec/datatypes/deneb import BlobsSidecar
 from ../spec/state_transition_block import validate_blobs_sidecar
 
 export sszdump, signatures_batch
@@ -166,7 +165,6 @@ proc dumpBlock[T](
 
 from ../consensus_object_pools/block_clearance import
   addBackfillBlock, addHeadBlock
-from ../beacon_chain_db import putBlobsSidecar
 
 proc storeBackfillBlock(
     self: var BlockProcessor,