small fixes

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -1295,7 +1295,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         Ok(self.store.get_blinded_block(block_root)?)
     }
 
-    pub fn get_payload(
+    pub fn get_payload_envelope(
         &self,
         block_root: &Hash256,
     ) -> Result<Option<SignedExecutionPayloadEnvelope<T::EthSpec>>, Error> {

beacon_node/beacon_chain/src/migrate.rs

@@ -638,7 +638,6 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
         // We don't know which blocks/payloads are shared among abandoned chains, so we buffer and delete
         // everything in one fell swoop.
         let mut blocks_to_prune: HashSet<Hash256> = HashSet::new();
-        let mut payloads_to_prune: HashSet<Hash256> = HashSet::new();
         let mut states_to_prune: HashSet<(Slot, Hash256)> = HashSet::new();
         let mut kept_summaries_for_hdiff = vec![];
 
@@ -729,7 +728,6 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
 
             if should_prune {
                 blocks_to_prune.insert(block_root);
-                payloads_to_prune.insert(block_root);
             }
         }
 
@@ -750,7 +748,6 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
             state_summaries_dag_roots = ?state_summaries_dag_roots,
             finalized_and_descendant_state_roots_of_finalized_checkpoint = finalized_and_descendant_state_roots_of_finalized_checkpoint.len(),
             blocks_to_prune = blocks_to_prune.len(),
-            payloads_to_prune = payloads_to_prune.len(),
             states_to_prune = states_to_prune.len(),
             "Extra pruning information"
         );

beacon_node/store/src/lib.rs

@@ -309,11 +309,9 @@ pub enum DBColumn {
     /// non-temporary by the deletion of their state root from this column.
     #[strum(serialize = "bst")]
     BeaconStateTemporary,
-    /// Pre-gloas execution payloads for blocks more recent than the finalized checkpoint.
+    /// Execution payloads for blocks more recent than the finalized checkpoint.
     #[strum(serialize = "exp")]
     ExecPayload,
-    // TODO(gloas) once finalized envelope pruning is implemented this comment should be updated
-    // "Post-gloas execution payload envlopes for payloads more recent than the finalized checkpoint"
     /// Post-gloas execution payload envelopes.
     #[strum(serialize = "pay")]
     PayloadEnvelope,