Skip to content

Commit

Permalink
fixup! Merge branch 'grarco/runtime-gas-meter' (#2838)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tzemanovic
tzemanovic committed Mar 31, 2024
1 parent dd9feea commit bea3c7a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
6 changes: 4 additions & 2 deletions crates/benches/native_vps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@ fn prepare_ibc_tx_and_ctx(bench_name: &str) -> (BenchShieldedCtx, Tx) {
),
);
let msg = MsgConnectionOpenInit {
client_id_on_a: ClientId::new("01-tendermint", 1).unwrap(),
client_id_on_a: ClientId::new("07-tendermint", 1).unwrap(),
counterparty: Counterparty::new(
ClientId::from_str("01-tendermint-1").unwrap(),
ClientId::from_str("07-tendermint-1").unwrap(),
None,
CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
),
Expand Down Expand Up @@ -364,6 +364,7 @@ fn prepare_ibc_tx_and_ctx(bench_name: &str) -> (BenchShieldedCtx, Tx) {
"outgoing_transfer" => {
let mut shielded_ctx = BenchShieldedCtx::default();
shielded_ctx.shell.init_ibc_channel();
shielded_ctx.shell.enable_ibc_transfer();
let outgoing_transfer =
shielded_ctx.shell.generate_ibc_transfer_tx();

Expand All @@ -372,6 +373,7 @@ fn prepare_ibc_tx_and_ctx(bench_name: &str) -> (BenchShieldedCtx, Tx) {
"outgoing_shielded_action" => {
let mut shielded_ctx = BenchShieldedCtx::default();
shielded_ctx.shell.init_ibc_channel();
shielded_ctx.shell.enable_ibc_transfer();

let albert_payment_addr = shielded_ctx
.wallet
Expand Down
32 changes: 15 additions & 17 deletions crates/namada/src/ledger/governance/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,6 @@ mod test {
use crate::ledger::pos;
use crate::vm::wasm;

const TX_GAS_LIMIT: u64 = 1_000_000;

fn init_storage() -> TestState {
let mut state = TestState::default();

Expand Down Expand Up @@ -928,7 +926,7 @@ mod test {
let keys_changed = BTreeSet::new();

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1153,7 +1151,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1250,7 +1248,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1350,7 +1348,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1449,7 +1447,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1528,7 +1526,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1607,7 +1605,7 @@ mod test {
let keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1704,7 +1702,7 @@ mod test {
]);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1801,7 +1799,7 @@ mod test {
]);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -1880,7 +1878,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -2004,7 +2002,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -2128,7 +2126,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -2252,7 +2250,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -2393,7 +2391,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down Expand Up @@ -2534,7 +2532,7 @@ mod test {
let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(TX_GAS_LIMIT.into()),
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
));
let (vp_wasm_cache, _vp_cache_dir) =
wasm::compilation_cache::common::testing::cache();
Expand Down

0 comments on commit bea3c7a

Please sign in to comment.