Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(transaction-pool) : impl MockTransaction for Desposit variant #5321

Merged
merged 11 commits into from
Nov 10, 2023
Merged

feat(transaction-pool) : impl MockTransaction for Desposit variant #5321

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b78ddb
Update mock.rs
DoTheBestToGetTheBest Nov 5, 2023
e912269
Update mock.rs
DoTheBestToGetTheBest Nov 5, 2023
7cea245
Update mock.rs
DoTheBestToGetTheBest Nov 5, 2023
b9a753a
Update mock.rs
DoTheBestToGetTheBest Nov 5, 2023
f901e5e
Update mock.rs
DoTheBestToGetTheBest Nov 5, 2023
9f44661
Update mock.rs
DoTheBestToGetTheBest Nov 6, 2023
e826cbc
Merge branch 'paradigmxyz:main' into mocktxs
DoTheBestToGetTheBest Nov 8, 2023
415b811
Update mock.rs
DoTheBestToGetTheBest Nov 8, 2023
b085ea5
Update mock.rs
DoTheBestToGetTheBest Nov 8, 2023
35a7988
Merge branch 'main' into mocktxs
mattsse Nov 10, 2023
9710c1d
support op setters
mattsse Nov 10, 2023
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
84 changes: 65 additions & 19 deletions crates/transaction-pool/src/test_utils/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,40 @@ pub fn mock_tx_pool() -> MockTxPool {
MockTxPool::new(Default::default(), Default::default())
}

macro_rules! op_set_value {
($this:ident, sender, $value:ident) => {
$this.from = $value;
};
($this:ident, gas_limit, $value:ident) => {
$this.gas_limit = $value;
};
($this:ident, value, $value:ident) => {
$this.value = $value.into();
};
($this:ident, input, $value:ident) => {
$this.value = $value;
};
($this:ident, $other:ident, $field:ident) => {};
}

macro_rules! op_get_value {
($this:ident, sender) => {
$this.from
};
($this:ident, gas_limit) => {
$this.gas_limit
};
($this:ident, value) => {
$this.value.into()
};
($this:ident, input) => {
$this.input.clone()
};
($this:ident, $other:ident) => {
Default::default()
};
}

/// Sets the value for the field
macro_rules! set_value {
($this:ident => $field:ident) => {
Expand All @@ -54,24 +88,24 @@ macro_rules! set_value {
*$field = new_value;
}
#[cfg(feature = "optimism")]
MockTransaction::Deposit(_) => {
panic!("not implemented")
MockTransaction::Deposit(ref mut tx) => {
op_set_value!(tx, $this, new_value);
}
}
};
}

/// Gets the value for the field
macro_rules! get_value {
($this:ident => $field:ident) => {
($this:tt => $field:ident) => {
match $this {
MockTransaction::Legacy { $field, .. } => $field,
MockTransaction::Eip1559 { $field, .. } => $field,
MockTransaction::Eip4844 { $field, .. } => $field,
MockTransaction::Eip2930 { $field, .. } => $field,
MockTransaction::Legacy { $field, .. } => $field.clone(),
MockTransaction::Eip1559 { $field, .. } => $field.clone(),
MockTransaction::Eip4844 { $field, .. } => $field.clone(),
MockTransaction::Eip2930 { $field, .. } => $field.clone(),
#[cfg(feature = "optimism")]
MockTransaction::Deposit(_) => {
panic!("not implemented")
MockTransaction::Deposit(tx) => {
op_get_value!(tx, $field)
}
}
};
Expand All @@ -92,7 +126,7 @@ macro_rules! make_setters_getters {
}

pub fn [<get_ $name>](&self) -> $t {
get_value!(self => $name).clone()
get_value!(self => $name)
}
)*}
};
Expand Down Expand Up @@ -308,9 +342,7 @@ impl MockTransaction {
}
MockTransaction::Eip2930 { gas_price, .. } => *gas_price = val,
#[cfg(feature = "optimism")]
MockTransaction::Deposit(_) => {
panic!("not implemented")
}
MockTransaction::Deposit(_) => {}
}
self
}
Expand Down Expand Up @@ -340,9 +372,7 @@ impl MockTransaction {
*gas_price = val;
}
#[cfg(feature = "optimism")]
MockTransaction::Deposit(_) => {
panic!("not implemented")
}
MockTransaction::Deposit(_) => {}
}
self
}
Expand Down Expand Up @@ -724,9 +754,25 @@ impl FromRecoveredTransaction for MockTransaction {
accesslist: access_list,
},
#[cfg(feature = "optimism")]
Transaction::Deposit { .. } => {
unimplemented!()
}
Transaction::Deposit(TxDeposit {
source_hash,
from,
to,
mint,
value,
gas_limit,
is_system_transaction,
input,
}) => MockTransaction::Deposit(TxDeposit {
source_hash,
from,
to,
mint,
value,
gas_limit,
is_system_transaction,
input,
}),
}
}
}
Expand Down
Loading