removes SHRED_PAYLOAD_SIZE

Author: behzadnouri

ledger/src/shred.rs

@@ -114,8 +114,6 @@ const SHRED_DATA_OFFSET: usize = SIZE_OF_COMMON_SHRED_HEADER + SIZE_OF_DATA_SHRE
 const OFFSET_OF_SHRED_TYPE: usize = SIZE_OF_SIGNATURE;
 const OFFSET_OF_SHRED_SLOT: usize = SIZE_OF_SIGNATURE + SIZE_OF_SHRED_TYPE;
 const OFFSET_OF_SHRED_INDEX: usize = OFFSET_OF_SHRED_SLOT + SIZE_OF_SHRED_SLOT;
-const_assert_eq!(SHRED_PAYLOAD_SIZE, 1228);
-const SHRED_PAYLOAD_SIZE: usize = PACKET_DATA_SIZE - SIZE_OF_NONCE;
 
 pub const MAX_DATA_SHREDS_PER_FEC_BLOCK: u32 = 32;
 

ledger/src/shred/legacy.rs

@@ -244,8 +244,8 @@ impl ShredData {
     }
 
     pub(super) fn resize_stored_shred(mut shred: Vec<u8>) -> Result<Vec<u8>, Error> {
-        // Old shreds might have been padded to super::SHRED_PAYLOAD_SIZE.
-        if !(SHRED_DATA_OFFSET..=super::SHRED_PAYLOAD_SIZE).contains(&shred.len()) {
+        // Old shreds might have been extra zero padded.
+        if !(SHRED_DATA_OFFSET..=ShredCode::SIZE_OF_PAYLOAD).contains(&shred.len()) {
             return Err(Error::InvalidPayloadSize(shred.len()));
         }
         shred.resize(Self::SIZE_OF_PAYLOAD, 0u8);
@@ -254,7 +254,7 @@ impl ShredData {
 }
 
 impl ShredCode {
-    const SIZE_OF_PAYLOAD: usize = super::SHRED_PAYLOAD_SIZE;
+    const SIZE_OF_PAYLOAD: usize = shred_code::ShredCode::SIZE_OF_PAYLOAD;
 
     pub(super) fn new_from_parity_shard(
         slot: Slot,

ledger/src/shred/merkle.rs

@@ -83,7 +83,7 @@ impl ShredData {
 }
 
 impl ShredCode {
-    const SIZE_OF_PAYLOAD: usize = super::SHRED_PAYLOAD_SIZE;
+    const SIZE_OF_PAYLOAD: usize = shred_code::ShredCode::SIZE_OF_PAYLOAD;
 
     fn proof_size(&self) -> Result<u8, Error> {
         match self.common_header.shred_variant {

ledger/src/shred/shred_code.rs

@@ -3,18 +3,23 @@ use {
         common::dispatch,
         legacy, merkle,
         traits::{Shred, ShredCode as ShredCodeTrait},
-        CodingShredHeader, Error, ShredCommonHeader, MAX_DATA_SHREDS_PER_FEC_BLOCK,
+        CodingShredHeader, Error, ShredCommonHeader, MAX_DATA_SHREDS_PER_FEC_BLOCK, SIZE_OF_NONCE,
     },
-    solana_sdk::{clock::Slot, signature::Signature},
+    solana_sdk::{clock::Slot, packet::PACKET_DATA_SIZE, signature::Signature},
+    static_assertions::const_assert_eq,
 };
 
+const_assert_eq!(ShredCode::SIZE_OF_PAYLOAD, 1228);
+
 #[derive(Clone, Debug, PartialEq)]
 pub enum ShredCode {
     Legacy(legacy::ShredCode),
     Merkle(merkle::ShredCode),
 }
 
 impl ShredCode {
+    pub(super) const SIZE_OF_PAYLOAD: usize = PACKET_DATA_SIZE - SIZE_OF_NONCE;
+
     dispatch!(fn coding_header(&self) -> &CodingShredHeader);
 
     dispatch!(pub(super) fn common_header(&self) -> &ShredCommonHeader);