pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-10 13:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

srml-contract: Contract refactors (#2924)

Browse Source 
* srml-contract: Refactor away unnecessary Option.

* srml-contract: Add assertion to gas_left test.

* srml-contract: Refactor try_evict_or_and_pay_rent to make tests pass.

* srml-contract: Add tests and comments for bugs in rent payment logic.

* srml-contract: Minor cleanup using GasMeter constructor.

* Bump node runtime impl version.
This commit is contained in:
Jim Posen
2019-06-27 14:49:53 +02:00
committed by Sergei Pepyakin
parent 62b7c05def
commit 068d99d481
7 changed files with 111 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/contracts/src/wasm/mod.rs
+8 -2
View File
@@ -175,7 +175,7 @@ mod tests {
use std::collections::HashMap;
use substrate_primitives::H256;
use crate::exec::{CallReceipt, Ext, InstantiateReceipt, EmptyOutputBuf, StorageKey};
use crate::gas::GasMeter;
use crate::gas::{Gas, GasMeter};
use crate::tests::{Test, Call};
use crate::wasm::prepare::prepare_contract;
use crate::CodeHash;
@@ -906,14 +906,20 @@ mod tests {
fn gas_left() {
let mut mock_ext = MockExt::default();
let mut gas_meter = GasMeter::with_limit(50_000, 1312);
let mut return_buf = Vec::new();
execute(
CODE_GAS_LEFT,
&[],
&mut Vec::new(),
&mut return_buf,
&mut mock_ext,
&mut gas_meter,
)
.unwrap();
let gas_left = Gas::decode(&mut &return_buf[..]).unwrap();
assert!(gas_left < 50_000, "gas_left must be less than initial");
assert!(gas_left > gas_meter.gas_left(), "gas_left must be greater than final");
}
const CODE_VALUE_TRANSFERRED: &str = r#"