From 5e2495557f04d0391e5d692e5262a9af2a837f51 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Mon, 26 Oct 2020 15:12:21 +0100 Subject: [PATCH] Update contracts for renaming --- contracts/burner/src/contract.rs | 8 ++++---- contracts/hackatom/src/contract.rs | 12 ++++++------ contracts/queue/src/contract.rs | 19 +++++++------------ contracts/reflect/src/contract.rs | 13 ++++++------- contracts/reflect/src/testing.rs | 6 +++--- contracts/staking/src/contract.rs | 21 ++++++++++----------- 6 files changed, 36 insertions(+), 43 deletions(-) diff --git a/contracts/burner/src/contract.rs b/contracts/burner/src/contract.rs index 57a74001b..7bbbbf24a 100644 --- a/contracts/burner/src/contract.rs +++ b/contracts/burner/src/contract.rs @@ -1,12 +1,12 @@ use cosmwasm_std::{ - attr, BankMsg, Binary, DepsMut, DepsRef, Env, HandleResponse, InitResponse, MessageInfo, + attr, BankMsg, Binary, Deps, DepsRef, Env, HandleResponse, InitResponse, MessageInfo, MigrateResponse, Order, StdError, StdResult, }; use crate::msg::{HandleMsg, InitMsg, MigrateMsg, QueryMsg}; pub fn init( - _deps: DepsMut, + _deps: Deps, _env: Env, _info: MessageInfo, _msg: InitMsg, @@ -17,7 +17,7 @@ pub fn init( } pub fn handle( - _deps: DepsMut, + _deps: Deps, _env: Env, _info: MessageInfo, _msg: HandleMsg, @@ -28,7 +28,7 @@ pub fn handle( } pub fn migrate( - deps: DepsMut, + deps: Deps, env: Env, _info: MessageInfo, msg: MigrateMsg, diff --git a/contracts/hackatom/src/contract.rs b/contracts/hackatom/src/contract.rs index 69151e07c..507785459 100644 --- a/contracts/hackatom/src/contract.rs +++ b/contracts/hackatom/src/contract.rs @@ -5,7 +5,7 @@ use std::convert::TryInto; use cosmwasm_std::{ from_slice, to_binary, to_vec, AllBalanceResponse, Api, BankMsg, Binary, CanonicalAddr, - Context, DepsMut, DepsRef, Env, HandleResponse, HumanAddr, InitResponse, MessageInfo, + Context, Deps, DepsRef, Env, HandleResponse, HumanAddr, InitResponse, MessageInfo, MigrateResponse, QueryRequest, QueryResponse, StdError, StdResult, WasmQuery, }; @@ -87,7 +87,7 @@ pub struct RecurseResponse { pub const CONFIG_KEY: &[u8] = b"config"; pub fn init( - deps: DepsMut, + deps: Deps, _env: Env, info: MessageInfo, msg: InitMsg, @@ -110,7 +110,7 @@ pub fn init( } pub fn migrate( - deps: DepsMut, + deps: Deps, _env: Env, _info: MessageInfo, msg: MigrateMsg, @@ -127,7 +127,7 @@ pub fn migrate( } pub fn handle( - deps: DepsMut, + deps: Deps, env: Env, info: MessageInfo, msg: HandleMsg, @@ -143,7 +143,7 @@ pub fn handle( } } -fn do_release(deps: DepsMut, env: Env, info: MessageInfo) -> Result { +fn do_release(deps: Deps, env: Env, info: MessageInfo) -> Result { let data = deps .storage .get(CONFIG_KEY) @@ -179,7 +179,7 @@ fn do_cpu_loop() -> Result { } } -fn do_storage_loop(deps: DepsMut) -> Result { +fn do_storage_loop(deps: Deps) -> Result { let mut test_case = 0u64; loop { deps.storage diff --git a/contracts/queue/src/contract.rs b/contracts/queue/src/contract.rs index 94cfd7145..52d3dfc24 100644 --- a/contracts/queue/src/contract.rs +++ b/contracts/queue/src/contract.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use cosmwasm_std::{ - from_slice, to_binary, to_vec, Binary, DepsMut, DepsRef, Env, HandleResponse, InitResponse, + from_slice, to_binary, to_vec, Binary, Deps, DepsRef, Env, HandleResponse, InitResponse, MessageInfo, Order, QueryResponse, StdResult, }; @@ -64,17 +64,12 @@ pub struct ListResponse { } // init is a no-op, just empty data -pub fn init( - _deps: DepsMut, - _env: Env, - _info: MessageInfo, - _msg: InitMsg, -) -> StdResult { +pub fn init(_deps: Deps, _env: Env, _info: MessageInfo, _msg: InitMsg) -> StdResult { Ok(InitResponse::default()) } pub fn handle( - deps: DepsMut, + deps: Deps, _env: Env, _info: MessageInfo, msg: HandleMsg, @@ -87,7 +82,7 @@ pub fn handle( const FIRST_KEY: u8 = 0; -fn enqueue(deps: DepsMut, value: i32) -> StdResult { +fn enqueue(deps: Deps, value: i32) -> StdResult { // find the last element in the queue and extract key let last_item = deps.storage.range(None, None, Order::Descending).next(); @@ -103,7 +98,7 @@ fn enqueue(deps: DepsMut, value: i32) -> StdResult { Ok(HandleResponse::default()) } -fn dequeue(deps: DepsMut) -> StdResult { +fn dequeue(deps: Deps) -> StdResult { // find the first element in the queue and extract value let first = deps.storage.range(None, None, Order::Ascending).next(); @@ -196,9 +191,9 @@ mod tests { use cosmwasm_std::testing::{ mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage, }; - use cosmwasm_std::{coins, from_binary, Deps}; + use cosmwasm_std::{coins, from_binary, OwnedDeps}; - fn create_contract() -> (Deps, MessageInfo) { + fn create_contract() -> (OwnedDeps, MessageInfo) { let mut deps = mock_dependencies(&coins(1000, "earth")); let info = mock_info("creator", &coins(1000, "earth")); let res = init(deps.as_mut(), mock_env(), info.clone(), InitMsg {}).unwrap(); diff --git a/contracts/reflect/src/contract.rs b/contracts/reflect/src/contract.rs index 8c174308f..b44255806 100644 --- a/contracts/reflect/src/contract.rs +++ b/contracts/reflect/src/contract.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{ - attr, to_binary, to_vec, Binary, ContractResult, CosmosMsg, DepsMut, DepsRef, Env, - HandleResponse, HumanAddr, InitResponse, MessageInfo, QueryRequest, StdError, StdResult, - SystemResult, + attr, to_binary, to_vec, Binary, ContractResult, CosmosMsg, Deps, DepsRef, Env, HandleResponse, + HumanAddr, InitResponse, MessageInfo, QueryRequest, StdError, StdResult, SystemResult, }; use crate::errors::ReflectError; @@ -12,7 +11,7 @@ use crate::msg::{ use crate::state::{config, config_read, State}; pub fn init( - deps: DepsMut, + deps: Deps, _env: Env, info: MessageInfo, _msg: InitMsg, @@ -26,7 +25,7 @@ pub fn init( } pub fn handle( - deps: DepsMut, + deps: Deps, env: Env, info: MessageInfo, msg: HandleMsg, @@ -38,7 +37,7 @@ pub fn handle( } pub fn try_reflect( - deps: DepsMut, + deps: Deps, _env: Env, info: MessageInfo, msgs: Vec>, @@ -65,7 +64,7 @@ pub fn try_reflect( } pub fn try_change_owner( - deps: DepsMut, + deps: Deps, _env: Env, info: MessageInfo, owner: HumanAddr, diff --git a/contracts/reflect/src/testing.rs b/contracts/reflect/src/testing.rs index fb7ebacdf..09542caea 100644 --- a/contracts/reflect/src/testing.rs +++ b/contracts/reflect/src/testing.rs @@ -1,18 +1,18 @@ use crate::msg::{SpecialQuery, SpecialResponse}; use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR}; -use cosmwasm_std::{to_binary, Binary, Coin, ContractResult, Deps, HumanAddr, SystemResult}; +use cosmwasm_std::{to_binary, Binary, Coin, ContractResult, HumanAddr, OwnedDeps, SystemResult}; /// A drop-in replacement for cosmwasm_std::testing::mock_dependencies /// this uses our CustomQuerier. pub fn mock_dependencies_with_custom_querier( contract_balance: &[Coin], -) -> Deps> { +) -> OwnedDeps> { let contract_addr = HumanAddr::from(MOCK_CONTRACT_ADDR); let custom_querier: MockQuerier = MockQuerier::new(&[(&contract_addr, contract_balance)]) .with_custom_handler(|query| SystemResult::Ok(custom_query_execute(&query))); - Deps { + OwnedDeps { storage: MockStorage::default(), api: MockApi::default(), querier: custom_querier, diff --git a/contracts/staking/src/contract.rs b/contracts/staking/src/contract.rs index 9145a22ca..a3677ce2d 100644 --- a/contracts/staking/src/contract.rs +++ b/contracts/staking/src/contract.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{ - attr, coin, to_binary, BankMsg, Binary, Decimal, DepsMut, DepsRef, Env, HandleResponse, - HumanAddr, InitResponse, MessageInfo, QuerierWrapper, StakingMsg, StdError, StdResult, Uint128, - WasmMsg, + attr, coin, to_binary, BankMsg, Binary, Decimal, Deps, DepsRef, Env, HandleResponse, HumanAddr, + InitResponse, MessageInfo, QuerierWrapper, StakingMsg, StdError, StdResult, Uint128, WasmMsg, }; use crate::errors::{StakingError, Unauthorized}; @@ -16,7 +15,7 @@ use crate::state::{ const FALLBACK_RATIO: Decimal = Decimal::one(); -pub fn init(deps: DepsMut, _env: Env, info: MessageInfo, msg: InitMsg) -> StdResult { +pub fn init(deps: Deps, _env: Env, info: MessageInfo, msg: InitMsg) -> StdResult { // ensure the validator is registered let vals = deps.querier.query_validators()?; if !vals.iter().any(|v| v.address == msg.validator) { @@ -51,7 +50,7 @@ pub fn init(deps: DepsMut, _env: Env, info: MessageInfo, msg: InitMsg) -> StdRes } pub fn handle( - deps: DepsMut, + deps: Deps, env: Env, info: MessageInfo, msg: HandleMsg, @@ -69,7 +68,7 @@ pub fn handle( } pub fn transfer( - deps: DepsMut, + deps: Deps, _env: Env, info: MessageInfo, recipient: HumanAddr, @@ -131,7 +130,7 @@ fn assert_bonds(supply: &Supply, bonded: Uint128) -> StdResult<()> { } } -pub fn bond(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult { +pub fn bond(deps: Deps, env: Env, info: MessageInfo) -> StdResult { let sender_raw = deps.api.canonical_address(&info.sender)?; // ensure we have the proper denom @@ -184,7 +183,7 @@ pub fn bond(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult StdResult { +pub fn claim(deps: Deps, env: Env, info: MessageInfo) -> StdResult { // find how many tokens the contract has let invest = invest_info_read(deps.storage.as_readonly()).load()?; let mut balance = deps @@ -302,7 +301,7 @@ pub fn claim(deps: DepsMut, env: Env, info: MessageInfo) -> StdResult StdResult { +pub fn reinvest(deps: Deps, env: Env, _info: MessageInfo) -> StdResult { let contract_addr = env.contract.address; let invest = invest_info_read(deps.storage.as_readonly()).load()?; let msg = to_binary(&HandleMsg::_BondAllTokens {})?; @@ -329,7 +328,7 @@ pub fn reinvest(deps: DepsMut, env: Env, _info: MessageInfo) -> StdResult Result {