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

Remove Epoch from WrapperTx #2946

Merged
merged 4 commits into from
May 9, 2024
Merged

Remove Epoch from WrapperTx #2946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17634a9
refactor: remove Epoch from WrapperTx
cpp-phoenix Mar 22, 2024
03d4c65
impl fix from review comment
brentstone Apr 24, 2024
43fdede
rebuild wasms for tests
brentstone Apr 24, 2024
90e6cb2
changelog: add #2946
brentstone Apr 25, 2024
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
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2946-remove-epoch-from-wrappertx.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Remove the epoch field from the wrapper tx.
([\#2946](https://github.com/anoma/namada/pull/2946))
1 change: 0 additions & 1 deletion crates/apps/src/lib/bench_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,6 @@ impl BenchShell {
token: self.state.in_mem().native_token.clone(),
},
defaults::albert_keypair().ref_to(),
self.state.in_mem().last_epoch,
0.into(),
None,
);
Expand Down
1 change: 0 additions & 1 deletion crates/apps/src/lib/config/genesis/transactions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ fn get_tx_to_sign(tag: impl AsRef<str>, data: impl BorshSerialize) -> Tx {
token: genesis_fee_token_address(),
},
fee_payer,
Default::default(),
0.into(),
None,
);
Expand Down
11 changes: 0 additions & 11 deletions crates/apps/src/lib/node/ledger/shell/finalize_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -2541,7 +2540,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand All @@ -2556,7 +2554,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair_2.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -2652,7 +2649,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand All @@ -2676,7 +2672,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair_2.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -2758,7 +2753,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2790,7 +2784,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -2964,7 +2957,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -3040,7 +3032,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -3132,7 +3123,6 @@ mod test_finalize_block {
token: native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -3223,7 +3213,6 @@ mod test_finalize_block {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
5_000_000.into(),
None,
))));
Expand Down
10 changes: 0 additions & 10 deletions crates/apps/src/lib/node/ledger/shell/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2305,7 +2305,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2344,7 +2343,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2418,7 +2416,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -2571,7 +2568,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
(block_gas_limit + 1).into(),
None,
))));
Expand Down Expand Up @@ -2604,7 +2600,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2643,7 +2638,6 @@ mod shell_tests {
token: address::testing::apfel(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -2678,7 +2672,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -2714,7 +2707,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
150_000.into(),
None,
))));
Expand Down Expand Up @@ -2750,7 +2742,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -2797,7 +2788,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down
15 changes: 0 additions & 15 deletions crates/apps/src/lib/node/ledger/shell/prepare_proposal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -719,7 +718,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -763,7 +761,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -800,7 +797,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -845,7 +841,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand All @@ -867,7 +862,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair_2.ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
))));
Expand Down Expand Up @@ -897,7 +891,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -946,7 +939,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
(block_gas_limit + 1).into(),
None,
);
Expand Down Expand Up @@ -985,7 +977,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
);
Expand Down Expand Up @@ -1040,7 +1031,6 @@ mod test_prepare_proposal {
token: address::testing::btc(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down Expand Up @@ -1088,7 +1078,6 @@ mod test_prepare_proposal {
token: address::testing::apfel(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down Expand Up @@ -1141,7 +1130,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down Expand Up @@ -1181,7 +1169,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down Expand Up @@ -1222,7 +1209,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down Expand Up @@ -1263,7 +1249,6 @@ mod test_prepare_proposal {
token: shell.state.in_mem().native_token.clone(),
},
crate::wallet::defaults::albert_keypair().ref_to(),
Epoch(0),
GAS_LIMIT_MULTIPLIER.into(),
None,
);
Expand Down
Loading
Loading