From e81a5029b8e6f6b4a2a72d381e62b7dc961ec8ac Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jchen.tc@gmail.com>
Date: Tue, 14 Mar 2023 11:48:58 +1100
Subject: [PATCH] Update SignedBlobSidecar container

---
 beacon_node/lighthouse_network/src/types/pubsub.rs            | 2 +-
 .../network/src/beacon_processor/worker/gossip_methods.rs     | 4 ++--
 consensus/types/src/signed_blob.rs                            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/beacon_node/lighthouse_network/src/types/pubsub.rs b/beacon_node/lighthouse_network/src/types/pubsub.rs
index 243e83148..87012859a 100644
--- a/beacon_node/lighthouse_network/src/types/pubsub.rs
+++ b/beacon_node/lighthouse_network/src/types/pubsub.rs
@@ -320,7 +320,7 @@ impl<T: EthSpec> std::fmt::Display for PubsubMessage<T> {
             PubsubMessage::BlobSidecar(data) => write!(
                 f,
                 "BlobSidecar: slot: {}, blob index: {}",
-                data.1.blob.slot, data.1.blob.index,
+                data.1.message.slot, data.1.message.index,
             ),
             PubsubMessage::AggregateAndProofAttestation(att) => write!(
                 f,
diff --git a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
index 0bdebd88f..15f9c5e29 100644
--- a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
+++ b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
@@ -664,8 +664,8 @@ impl<T: BeaconChainTypes> Worker<T> {
            "peer_id" => %peer_id,
            "client" => %peer_client,
            "blob_topic" => blob_index,
-           "blob_index" => signed_blob.blob.index,
-           "blob_slot" => signed_blob.blob.slot
+           "blob_index" => signed_blob.message.index,
+           "blob_slot" => signed_blob.message.slot
         );
     }
 
diff --git a/consensus/types/src/signed_blob.rs b/consensus/types/src/signed_blob.rs
index a3cfb9d58..8e2e47676 100644
--- a/consensus/types/src/signed_blob.rs
+++ b/consensus/types/src/signed_blob.rs
@@ -19,6 +19,6 @@ use tree_hash_derive::TreeHash;
 #[serde(bound = "T: EthSpec")]
 #[arbitrary(bound = "T: EthSpec")]
 pub struct SignedBlobSidecar<T: EthSpec> {
-    pub blob: BlobSidecar<T>,
+    pub message: BlobSidecar<T>,
     pub signature: Signature,
 }