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

Commit 5b509ee

Browse files
atheiathei
committed
Increase supplied gas_limit in tests
1 parent ee7b0c0 commit 5b509ee

File tree

4 files changed

+149
-136
lines changed

4 files changed

+149
-136
lines changed

‎bin/node/executor/tests/basic.rs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,13 +606,18 @@ fn deploying_wasm_contract_should_work() {
606606
CheckedExtrinsic {
607607
signed: Some((charlie(), signed_extra(0, 0))),
608608
function: Call::Contracts(
609-
pallet_contracts::Call::put_code::<Runtime>(10_000, transfer_code)
609+
pallet_contracts::Call::put_code::<Runtime>(500_000_000, transfer_code)
610610
),
611611
},
612612
CheckedExtrinsic {
613613
signed: Some((charlie(), signed_extra(1, 0))),
614614
function: Call::Contracts(
615-
pallet_contracts::Call::instantiate::<Runtime>(1 * DOLLARS, 10_000, transfer_ch, Vec::new())
615+
pallet_contracts::Call::instantiate::<Runtime>(
616+
1 * DOLLARS,
617+
500_000_000,
618+
transfer_ch,
619+
Vec::new()
620+
)
616621
),
617622
},
618623
CheckedExtrinsic {
@@ -621,7 +626,7 @@ fn deploying_wasm_contract_should_work() {
621626
pallet_contracts::Call::call::<Runtime>(
622627
pallet_indices::address::Address::Id(addr.clone()),
623628
10,
624-
10_000,
629+
500_000_000,
625630
vec![0x00, 0x01, 0x02, 0x03]
626631
)
627632
),

‎frame/contracts/src/exec.rs‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,7 @@ mod tests {
896896
use crate::{
897897
account_db::AccountDb, gas::GasMeter, tests::{ExtBuilder, Test},
898898
exec::{ExecReturnValue, ExecError, STATUS_SUCCESS}, CodeHash, Config,
899+
gas::Gas,
899900
};
900901
use std::{cell::RefCell, rc::Rc, collections::HashMap, marker::PhantomData};
901902
use assert_matches::assert_matches;
@@ -905,6 +906,8 @@ mod tests {
905906
const BOB: u64 = 2;
906907
const CHARLIE: u64 = 3;
907908

909+
const GAS_LIMIT: Gas = 10_000_000_000;
910+
908911
impl<'a, T, V, L> ExecutionContext<'a, T, V, L>
909912
where T: crate::Trait
910913
{
@@ -1010,7 +1013,7 @@ mod tests {
10101013
#[test]
10111014
fn it_works() {
10121015
let value = Default::default();
1013-
let mut gas_meter = GasMeter::<Test>::new(10000);
1016+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
10141017
let data = vec![];
10151018

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

1054-
let mut gas_meter = GasMeter::<Test>::new(1000);
1057+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
10551058

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

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

1074-
let mut gas_meter = GasMeter::<Test>::new(1000);
1077+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
10751078

10761079
let result = ctx.instantiate(1, &mut gas_meter, &code, vec![]);
10771080
assert_matches!(result, Ok(_));
@@ -1100,7 +1103,7 @@ mod tests {
11001103
let output = ctx.call(
11011104
dest,
11021105
55,
1103-
&mut GasMeter::<Test>::new(1000),
1106+
&mut GasMeter::<Test>::new(GAS_LIMIT),
11041107
vec![],
11051108
).unwrap();
11061109

@@ -1133,7 +1136,7 @@ mod tests {
11331136
let output = ctx.call(
11341137
dest,
11351138
55,
1136-
&mut GasMeter::<Test>::new(1000),
1139+
&mut GasMeter::<Test>::new(GAS_LIMIT),
11371140
vec![],
11381141
).unwrap();
11391142

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

1162-
let mut gas_meter = GasMeter::<Test>::new(1000);
1165+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
11631166

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

1187-
let mut gas_meter = GasMeter::<Test>::new(1000);
1190+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
11881191

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

1215-
let mut gas_meter = GasMeter::<Test>::new(1000);
1218+
let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
12161219

12171220
let result = ctx.instantiate(50, &mut gas_meter, &code, vec![]);
12181221
assert_matches!(result, Ok(_));
@@ -1246,7 +1249,7 @@ mod tests {
12461249
let result = ctx.call(
12471250
dest,
12481251
100,
1249-
&mut GasMeter::<Test>::new(1000),
1252+
&mut GasMeter::<Test>::new(GAS_LIMIT),
12501253
vec![],
12511254
);
12521255

@@ -1283,7 +1286,7 @@ mod tests {
12831286
let result = ctx.call(
12841287
dest,
12851288
0,
1286-
&mut GasMeter::<Test>::new(1000),
1289+
&mut GasMeter::<Test>::new(GAS_LIMIT),
12871290
vec![],
12881291
);
12891292

@@ -1314,7 +1317,7 @@ mod tests {
13141317
let result = ctx.call(
13151318
dest,
13161319
0,
1317-
&mut GasMeter::<Test>::new(1000),
1320+
&mut GasMeter::<Test>::new(GAS_LIMIT),
13181321
vec![],
13191322
);
13201323

@@ -1342,7 +1345,7 @@ mod tests {
13421345
let result = ctx.call(
13431346
BOB,
13441347
0,
1345-
&mut GasMeter::<Test>::new(10000),
1348+
&mut GasMeter::<Test>::new(GAS_LIMIT),
13461349
vec![1, 2, 3, 4],
13471350
);
13481351
assert_matches!(result, Ok(_));
@@ -1367,7 +1370,7 @@ mod tests {
13671370

13681371
let result = ctx.instantiate(
13691372
1,
1370-
&mut GasMeter::<Test>::new(10000),
1373+
&mut GasMeter::<Test>::new(GAS_LIMIT),
13711374
&input_data_ch,
13721375
vec![1, 2, 3, 4],
13731376
);
@@ -1417,7 +1420,7 @@ mod tests {
14171420
let result = ctx.call(
14181421
BOB,
14191422
value,
1420-
&mut GasMeter::<Test>::new(100000),
1423+
&mut GasMeter::<Test>::new(GAS_LIMIT),
14211424
vec![],
14221425
);
14231426

@@ -1463,7 +1466,7 @@ mod tests {
14631466
let result = ctx.call(
14641467
dest,
14651468
0,
1466-
&mut GasMeter::<Test>::new(10000),
1469+
&mut GasMeter::<Test>::new(GAS_LIMIT),
14671470
vec![],
14681471
);
14691472

@@ -1504,7 +1507,7 @@ mod tests {
15041507
let result = ctx.call(
15051508
BOB,
15061509
0,
1507-
&mut GasMeter::<Test>::new(10000),
1510+
&mut GasMeter::<Test>::new(GAS_LIMIT),
15081511
vec![],
15091512
);
15101513

@@ -1526,7 +1529,7 @@ mod tests {
15261529
assert_matches!(
15271530
ctx.instantiate(
15281531
0, // <- zero endowment
1529-
&mut GasMeter::<Test>::new(10000),
1532+
&mut GasMeter::<Test>::new(GAS_LIMIT),
15301533
&dummy_ch,
15311534
vec![],
15321535
),
@@ -1552,7 +1555,7 @@ mod tests {
15521555
let instantiated_contract_address = assert_matches!(
15531556
ctx.instantiate(
15541557
100,
1555-
&mut GasMeter::<Test>::new(10000),
1558+
&mut GasMeter::<Test>::new(GAS_LIMIT),
15561559
&dummy_ch,
15571560
vec![],
15581561
),
@@ -1592,7 +1595,7 @@ mod tests {
15921595
let instantiated_contract_address = assert_matches!(
15931596
ctx.instantiate(
15941597
100,
1595-
&mut GasMeter::<Test>::new(10000),
1598+
&mut GasMeter::<Test>::new(GAS_LIMIT),
15961599
&dummy_ch,
15971600
vec![],
15981601
),
@@ -1637,7 +1640,7 @@ mod tests {
16371640
ctx.overlay.instantiate_contract(&BOB, instantiator_ch).unwrap();
16381641

16391642
assert_matches!(
1640-
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(1000), vec![]),
1643+
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
16411644
Ok(_)
16421645
);
16431646

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

16991702
assert_matches!(
1700-
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(1000), vec![]),
1703+
ctx.call(BOB, 20, &mut GasMeter::<Test>::new(GAS_LIMIT), vec![]),
17011704
Ok(_)
17021705
);
17031706

@@ -1734,7 +1737,7 @@ mod tests {
17341737
assert_matches!(
17351738
ctx.instantiate(
17361739
100,
1737-
&mut GasMeter::<Test>::new(10000),
1740+
&mut GasMeter::<Test>::new(GAS_LIMIT),
17381741
&terminate_ch,
17391742
vec![],
17401743
),
@@ -1770,7 +1773,7 @@ mod tests {
17701773

17711774
let result = ctx.instantiate(
17721775
1,
1773-
&mut GasMeter::<Test>::new(10000),
1776+
&mut GasMeter::<Test>::new(GAS_LIMIT),
17741777
&rent_allowance_ch,
17751778
vec![],
17761779
);

0 commit comments

Comments
 (0)