Skip to content

Commit

Permalink
Merge remote-tracking branch 'cpp-phoenix/cpp-phoenix/remove-epoch-fr…
Browse files Browse the repository at this point in the history 
…om-wrappertx' into brent/draft+2946+3100

* cpp-phoenix/cpp-phoenix/remove-epoch-from-wrappertx:
  changelog: add #2946
  rebuild wasms for tests
  impl fix from review comment
  refactor: remove Epoch from WrapperTx
  • Loading branch information
@brentstone
brentstone committed Apr 26, 2024
2 parents 2268b7d + 1572234 commit 91bcdb2
Show file tree
Hide file tree
Showing 44 changed files with 22 additions and 132 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2946-remove-epoch-from-wrappertx.md
View file
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
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,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
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
9 changes: 0 additions & 9 deletions crates/apps/src/lib/node/ledger/shell/finalize_block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,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 @@ -2546,7 +2545,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 @@ -2561,7 +2559,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 @@ -2763,7 +2760,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 @@ -2795,7 +2791,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 @@ -2969,7 +2964,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 @@ -3045,7 +3039,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 @@ -3137,7 +3130,6 @@ mod test_finalize_block {
token: native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
WRAPPER_GAS_LIMIT.into(),
None,
))));
Expand Down Expand Up @@ -3228,7 +3220,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
Original file line number Diff line number Diff line change
Expand Up @@ -2306,7 +2306,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2345,7 +2344,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2419,7 +2417,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 @@ -2572,7 +2569,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 @@ -2605,7 +2601,6 @@ mod shell_tests {
token: shell.state.in_mem().native_token.clone(),
},
keypair.ref_to(),
Epoch(0),
0.into(),
None,
))));
Expand Down Expand Up @@ -2644,7 +2639,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 @@ -2679,7 +2673,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 @@ -2715,7 +2708,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 @@ -2751,7 +2743,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 @@ -2798,7 +2789,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
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

0 comments on commit 91bcdb2

Please sign in to comment.