Merge pull request #668 from CosmWasm/metering-restart

Add metering restart

Author: webmaster128

.circleci/config.yml

@@ -27,6 +27,7 @@ workflows:
                 # 👇 Add your branch here if benchmarking matters to your work
                 - benchmarking
                 - update-wasmer
+                - metering-restart
   deploy:
     jobs:
       - build_and_upload_devcontracts:

Cargo.lock

@@ -20,7 +20,8 @@
 use cosmwasm_std::{from_binary, from_slice, HandleResponse, HumanAddr, InitResponse, MessageInfo};
 use cosmwasm_vm::{
     testing::{
-        handle, init, mock_env, mock_info, mock_instance, query, MockApi, MockQuerier, MockStorage,
+        handle, init, mock_env, mock_info, mock_instance_with_gas_limit, query, MockApi,
+        MockQuerier, MockStorage,
     },
     Instance,
 };
@@ -32,7 +33,8 @@ use queue::contract::{
 static WASM: &[u8] = include_bytes!("../target/wasm32-unknown-unknown/release/queue.wasm");
 
 fn create_contract() -> (Instance<MockApi, MockStorage, MockQuerier>, MessageInfo) {
-    let mut deps = mock_instance(WASM, &[]);
+    let gas_limit = 500_000_000; // enough for many executions within one instance
+    let mut deps = mock_instance_with_gas_limit(WASM, gas_limit);
     let creator = HumanAddr(String::from("creator"));
     let info = mock_info(creator.as_str(), &[]);
     let res: InitResponse = init(&mut deps, mock_env(), info.clone(), InitMsg {}).unwrap();

contracts/burner/Cargo.lock

@@ -24,7 +24,6 @@ backtraces = []
 # we keep this optional, to allow possible future integration (or different Cosmos Backends)
 iterator = ["cosmwasm-std/iterator"]
 staking = ["cosmwasm-std/staking"]
-metering = []
 # Use cranelift backend instead of singlepass. This is required for development on Windows.
 cranelift = ["wasmer/cranelift"]
 
@@ -45,10 +44,12 @@ sha2 = "0.9.1"
 thiserror = "1.0"
 wasmer = { git = "https://github.com/wasmerio/wasmer", rev = "22c7bc8", default-features = false, features = ["jit", "singlepass"] }
 wasmer-engine = { git = "https://github.com/wasmerio/wasmer", rev = "22c7bc8" }
+wasmer-middlewares = { git = "https://github.com/wasmerio/wasmer", rev = "22c7bc8" }
 
 # Wasmer local (used for quick local debugging or patching)
 # wasmer = { path = "../../../wasmer/lib/api", default-features = false, features = ["jit", "singlepass"] }
 # wasmer-engine = { path = "../../../wasmer/lib/engine" }
+# wasmer-middlewares = { path = "../../../wasmer/lib/middlewares" }
 
 [dev-dependencies]
 criterion = "0.3"