Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Increase supplied gas_limit in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@athei
athei committed Apr 22, 2020
1 parent ee7b0c0 commit 5b509ee
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 136 deletions.
11 changes: 8 additions & 3 deletions bin/node/executor/tests/basic.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,13 +606,18 @@ fn deploying_wasm_contract_should_work() {
CheckedExtrinsic {
signed: Some((charlie(), signed_extra(0, 0))),
function: Call::Contracts(
pallet_contracts::Call::put_code::<Runtime>(10_000, transfer_code)
pallet_contracts::Call::put_code::<Runtime>(500_000_000, transfer_code)
),
},
CheckedExtrinsic {
signed: Some((charlie(), signed_extra(1, 0))),
function: Call::Contracts(
pallet_contracts::Call::instantiate::<Runtime>(1 * DOLLARS, 10_000, transfer_ch, Vec::new())
pallet_contracts::Call::instantiate::<Runtime>(
1 * DOLLARS,
500_000_000,
transfer_ch,
Vec::new()
)
),
},
CheckedExtrinsic {
Expand All @@ -621,7 +626,7 @@ fn deploying_wasm_contract_should_work() {
pallet_contracts::Call::call::<Runtime>(
pallet_indices::address::Address::Id(addr.clone()),
10,
10_000,
500_000_000,
vec![0x00, 0x01, 0x02, 0x03]
)
),
Expand Down
49 changes: 26 additions & 23 deletions frame/contracts/src/exec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@ mod tests {
use crate::{
account_db::AccountDb, gas::GasMeter, tests::{ExtBuilder, Test},
exec::{ExecReturnValue, ExecError, STATUS_SUCCESS}, CodeHash, Config,
gas::Gas,
};
use std::{cell::RefCell, rc::Rc, collections::HashMap, marker::PhantomData};
use assert_matches::assert_matches;
Expand All @@ -905,6 +906,8 @@ mod tests {
const BOB: u64 = 2;
const CHARLIE: u64 = 3;

const GAS_LIMIT: Gas = 10_000_000_000;

impl<'a, T, V, L> ExecutionContext<'a, T, V, L>
where T: crate::Trait
{
Expand Down Expand Up @@ -1010,7 +1013,7 @@ mod tests {
#[test]
fn it_works() {
let value = Default::default();
let mut gas_meter = GasMeter::<Test>::new(10000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
let data = vec![];

let vm = MockVm::new();
Expand Down Expand Up @@ -1051,7 +1054,7 @@ mod tests {
ctx.overlay.set_balance(&origin, 100);
ctx.overlay.set_balance(&dest, 0);

let mut gas_meter = GasMeter::<Test>::new(1000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);

let result = ctx.call(dest, 0, &mut gas_meter, vec![]);
assert_matches!(result, Ok(_));
Expand All @@ -1071,7 +1074,7 @@ mod tests {

ctx.overlay.set_balance(&origin, 100);

let mut gas_meter = GasMeter::<Test>::new(1000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);

let result = ctx.instantiate(1, &mut gas_meter, &code, vec![]);
assert_matches!(result, Ok(_));
Expand Down Expand Up @@ -1100,7 +1103,7 @@ mod tests {
let output = ctx.call(
dest,
55,
&mut GasMeter::<Test>::new(1000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
).unwrap();

Expand Down Expand Up @@ -1133,7 +1136,7 @@ mod tests {
let output = ctx.call(
dest,
55,
&mut GasMeter::<Test>::new(1000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
).unwrap();

Expand All @@ -1159,7 +1162,7 @@ mod tests {
ctx.overlay.set_balance(&origin, 100);
ctx.overlay.set_balance(&dest, 0);

let mut gas_meter = GasMeter::<Test>::new(1000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);

let result = ctx.call(dest, 50, &mut gas_meter, vec![]);
assert_matches!(result, Ok(_));
Expand All @@ -1184,7 +1187,7 @@ mod tests {
ctx.overlay.set_balance(&origin, 100);
ctx.overlay.set_balance(&dest, 15);

let mut gas_meter = GasMeter::<Test>::new(1000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);

let result = ctx.call(dest, 50, &mut gas_meter, vec![]);
assert_matches!(result, Ok(_));
Expand Down Expand Up @@ -1212,7 +1215,7 @@ mod tests {
ctx.overlay.set_balance(&origin, 100);
ctx.overlay.set_balance(&dest, 15);

let mut gas_meter = GasMeter::<Test>::new(1000);
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);

let result = ctx.instantiate(50, &mut gas_meter, &code, vec![]);
assert_matches!(result, Ok(_));
Expand Down Expand Up @@ -1246,7 +1249,7 @@ mod tests {
let result = ctx.call(
dest,
100,
&mut GasMeter::<Test>::new(1000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand Down Expand Up @@ -1283,7 +1286,7 @@ mod tests {
let result = ctx.call(
dest,
0,
&mut GasMeter::<Test>::new(1000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand Down Expand Up @@ -1314,7 +1317,7 @@ mod tests {
let result = ctx.call(
dest,
0,
&mut GasMeter::<Test>::new(1000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand Down Expand Up @@ -1342,7 +1345,7 @@ mod tests {
let result = ctx.call(
BOB,
0,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![1, 2, 3, 4],
);
assert_matches!(result, Ok(_));
Expand All @@ -1367,7 +1370,7 @@ mod tests {

let result = ctx.instantiate(
1,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&input_data_ch,
vec![1, 2, 3, 4],
);
Expand Down Expand Up @@ -1417,7 +1420,7 @@ mod tests {
let result = ctx.call(
BOB,
value,
&mut GasMeter::<Test>::new(100000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand Down Expand Up @@ -1463,7 +1466,7 @@ mod tests {
let result = ctx.call(
dest,
0,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand Down Expand Up @@ -1504,7 +1507,7 @@ mod tests {
let result = ctx.call(
BOB,
0,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
vec![],
);

Expand All @@ -1526,7 +1529,7 @@ mod tests {
assert_matches!(
ctx.instantiate(
0, // <- zero endowment
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&dummy_ch,
vec![],
),
Expand All @@ -1552,7 +1555,7 @@ mod tests {
let instantiated_contract_address = assert_matches!(
ctx.instantiate(
100,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&dummy_ch,
vec![],
),
Expand Down Expand Up @@ -1592,7 +1595,7 @@ mod tests {
let instantiated_contract_address = assert_matches!(
ctx.instantiate(
100,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&dummy_ch,
vec![],
),
Expand Down Expand Up @@ -1637,7 +1640,7 @@ mod tests {
ctx.overlay.instantiate_contract(&BOB, instantiator_ch).unwrap();

assert_matches!(
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(1000), vec![]),
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
Ok(_)
);

Expand Down Expand Up @@ -1697,7 +1700,7 @@ mod tests {
ctx.overlay.instantiate_contract(&BOB, instantiator_ch).unwrap();

assert_matches!(
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(1000), vec![]),
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
Ok(_)
);

Expand Down Expand Up @@ -1734,7 +1737,7 @@ mod tests {
assert_matches!(
ctx.instantiate(
100,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&terminate_ch,
vec![],
),
Expand Down Expand Up @@ -1770,7 +1773,7 @@ mod tests {

let result = ctx.instantiate(
1,
&mut GasMeter::<Test>::new(10000),
&mut GasMeter::<Test>::new(GAS_LIMIT),
&rent_allowance_ch,
vec![],
);
Expand Down
Loading

0 comments on commit 5b509ee

Please sign in to comment.