diff --git a/consensus/consensus-types/src/pipelined_block.rs b/consensus/consensus-types/src/pipelined_block.rs index 375dd93a0a1cfd..67a972757fe8ad 100644 --- a/consensus/consensus-types/src/pipelined_block.rs +++ b/consensus/consensus-types/src/pipelined_block.rs @@ -62,14 +62,12 @@ impl Serialize for PipelinedBlock { struct SerializedBlock<'a> { block: &'a Block, input_transactions: &'a Vec, - state_compute_result: &'a StateComputeResult, randomness: Option<&'a Randomness>, } let serialized = SerializedBlock { block: &self.block, input_transactions: &self.input_transactions, - state_compute_result: &self.state_compute_result, randomness: self.randomness.get(), }; serialized.serialize(serializer) @@ -86,21 +84,19 @@ impl<'de> Deserialize<'de> for PipelinedBlock { struct SerializedBlock { block: Block, input_transactions: Vec, - state_compute_result: StateComputeResult, randomness: Option, } let SerializedBlock { block, input_transactions, - state_compute_result, randomness, } = SerializedBlock::deserialize(deserializer)?; let block = PipelinedBlock { block, input_transactions, - state_compute_result, + state_compute_result: StateComputeResult::new_dummy(), randomness: OnceCell::new(), pipeline_insertion_time: OnceCell::new(), execution_summary: Arc::new(OnceCell::new()), diff --git a/execution/executor-types/src/lib.rs b/execution/executor-types/src/lib.rs index 8ae1701243ca2f..db08fc580293e7 100644 --- a/execution/executor-types/src/lib.rs +++ b/execution/executor-types/src/lib.rs @@ -30,7 +30,6 @@ use aptos_types::{ pub use error::{ExecutorError, ExecutorResult}; pub use ledger_update_output::LedgerUpdateOutput; pub use parsed_transaction_output::ParsedTransactionOutput; -use serde::{Deserialize, Serialize}; use std::{ cmp::max, collections::{BTreeSet, HashMap}, @@ -287,7 +286,7 @@ pub struct ChunkCommitNotification { /// of success / failure of the transactions. /// Note that the specific details of compute_status are opaque to StateMachineReplication, /// which is going to simply pass the results between StateComputer and PayloadClient. -#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize, Deserialize)] +#[derive(Debug, Default, PartialEq, Eq, Clone)] pub struct StateComputeResult { /// transaction accumulator root hash is identified as `state_id` in Consensus. root_hash: HashValue,