Merge commit 'ca2eb94890' into bump/0.5.83

EspressoSystems · Jan 9, 2025 · c8c5d2a · c8c5d2a
2 parents 8ac4d09 + ca2eb94
commit c8c5d2a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/crates/task-impls/src/upgrade.rs b/crates/task-impls/src/upgrade.rs
@@ -291,7 +291,6 @@ impl<TYPES: NodeType, V: Versions> UpgradeTaskState<TYPES, V> {
                     let upgrade_proposal = UpgradeProposal {
                         upgrade_proposal: upgrade_proposal_data.clone(),
                         view_number: TYPES::View::new(view + UPGRADE_PROPOSE_OFFSET),
-                        epoch: self.cur_epoch,
                     };
 
                     let signature = TYPES::SignatureKey::sign(

diff --git a/crates/testing/tests/tests_1/vid_task.rs b/crates/testing/tests/tests_1/vid_task.rs
@@ -80,7 +80,6 @@ async fn test_vid_task() {
             num_transactions: encoded_transactions.len() as u64,
         },
         view_number: ViewNumber::new(2),
-        epoch: EpochNumber::new(0),
     };
     let message = Proposal {
         data: proposal.clone(),

diff --git a/crates/types/src/data.rs b/crates/types/src/data.rs
@@ -146,8 +146,6 @@ pub struct DaProposal<TYPES: NodeType> {
     pub metadata: <TYPES::BlockPayload as BlockPayload<TYPES>>::Metadata,
     /// View this proposal applies to
     pub view_number: TYPES::View,
-    /// Epoch this proposal applies to
-    pub epoch: TYPES::Epoch,
 }
 
 /// A proposal to start providing data availability for a block.
@@ -181,7 +179,6 @@ impl<TYPES: NodeType> From<DaProposal2<TYPES>> for DaProposal<TYPES> {
             encoded_transactions: da_proposal2.encoded_transactions,
             metadata: da_proposal2.metadata,
             view_number: da_proposal2.view_number,
-            epoch: TYPES::Epoch::new(0),
         }
     }
 }
@@ -197,8 +194,6 @@ where
     pub upgrade_proposal: UpgradeProposalData<TYPES>,
     /// View this proposal applies to
     pub view_number: TYPES::View,
-    /// Epoch this proposal applies to
-    pub epoch: TYPES::Epoch,
 }
 
 /// VID dispersal data