Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime-transaction/src/runtime_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//! ALT, RuntimeTransaction<SanitizedMessage> transits into Dynamically Loaded state,
//! with its dynamic metadata loaded.
use {
crate::transaction_meta::{DynamicMeta, StaticMeta, TransactionMeta},
crate::transaction_meta::{StaticMeta, TransactionMeta},
core::ops::Deref,
solana_compute_budget_instruction::compute_budget_instruction_details::*,
solana_hash::Hash,
Expand Down Expand Up @@ -59,7 +59,7 @@ impl<T> StaticMeta for RuntimeTransaction<T> {
}
}

impl<T: SVMMessage> DynamicMeta for RuntimeTransaction<T> {}


impl<T> Deref for RuntimeTransaction<T> {
type Target = T;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,13 @@ impl RuntimeTransaction<SanitizedTransaction> {
reserved_account_keys,
)?;

let mut tx = Self {
let tx = Self {
transaction: sanitized_transaction,
meta: statically_loaded_runtime_tx.meta,
};
tx.load_dynamic_metadata()?;

Ok(tx)
}

fn load_dynamic_metadata(&mut self) -> Result<()> {
Ok(())
}
}

impl TransactionWithMeta for RuntimeTransaction<SanitizedTransaction> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,10 @@ impl<D: TransactionData> RuntimeTransaction<ResolvedTransactionView<D>> {
let transaction =
ResolvedTransactionView::try_new(transaction, loaded_addresses, reserved_account_keys)
.map_err(|_| TransactionError::SanitizeFailure)?;
let mut tx = Self { transaction, meta };
tx.load_dynamic_metadata()?;
let tx = Self { transaction, meta };

Ok(tx)
}

fn load_dynamic_metadata(&mut self) -> Result<()> {
Ok(())
}
}

impl<D: TransactionData> TransactionWithMeta for RuntimeTransaction<ResolvedTransactionView<D>> {
Expand Down
9 changes: 1 addition & 8 deletions runtime-transaction/src/transaction_meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//! Hence they are not Option<T> type. Their visibility at different states
//! are defined in traits.
//!
//! The StaticMeta and DynamicMeta traits are accessor traits on the
//! The StaticMeta trait is accessor traits on the
//! RuntimeTransaction types, not the TransactionMeta itself.
//!
use {
Expand All @@ -26,13 +26,6 @@ pub trait StaticMeta {
fn instruction_data_len(&self) -> u16;
}

/// Statically loaded meta is a supertrait of Dynamically loaded meta, when
/// transaction transited successfully into dynamically loaded, it should
/// have both meta data populated and available.
/// Dynamic metadata available after accounts addresses are loaded from
/// on-chain ALT, examples are: transaction usage costs, nonce account.
pub trait DynamicMeta: StaticMeta {}

#[cfg_attr(feature = "dev-context-only-utils", derive(Clone))]
#[derive(Debug)]
pub struct TransactionMeta {
Expand Down
Loading