Deps/DepsRef -> DepsMut/Deps

Author: ethanfrey

contracts/burner/src/contract.rs

@@ -1,12 +1,12 @@
 use cosmwasm_std::{
-    attr, BankMsg, Binary, Deps, DepsRef, Env, HandleResponse, InitResponse, MessageInfo,
+    attr, BankMsg, Binary, Deps, DepsMutMut, Env, HandleResponse, InitResponse, MessageInfo,
     MigrateResponse, Order, StdError, StdResult,
 };
 
 use crate::msg::{HandleMsg, InitMsg, MigrateMsg, QueryMsg};
 
 pub fn init(
-    _deps: Deps,
+    _deps: DepsMut,
     _env: Env,
     _info: MessageInfo,
     _msg: InitMsg,
@@ -17,7 +17,7 @@ pub fn init(
 }
 
 pub fn handle(
-    _deps: Deps,
+    _deps: DepsMut,
     _env: Env,
     _info: MessageInfo,
     _msg: HandleMsg,
@@ -28,7 +28,7 @@ pub fn handle(
 }
 
 pub fn migrate(
-    deps: Deps,
+    deps: DepsMut,
     env: Env,
     _info: MessageInfo,
     msg: MigrateMsg,
@@ -61,7 +61,7 @@ pub fn migrate(
     })
 }
 
-pub fn query(_deps: DepsRef, _env: Env, _msg: QueryMsg) -> StdResult<Binary> {
+pub fn query(_deps: Deps, _env: Env, _msg: QueryMsg) -> StdResult<Binary> {
     Err(StdError::generic_err(
         "You can only use this contract for migrations",
     ))

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, Deps, DepsRef, Env, HandleResponse, HumanAddr, InitResponse, MessageInfo,
+    Context, Deps, DepsMut, 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: Deps,
+    deps: DepsMut,
     _env: Env,
     info: MessageInfo,
     msg: InitMsg,
@@ -110,7 +110,7 @@ pub fn init(
 }
 
 pub fn migrate(
-    deps: Deps,
+    deps: DepsMut,
     _env: Env,
     _info: MessageInfo,
     msg: MigrateMsg,
@@ -127,7 +127,7 @@ pub fn migrate(
 }
 
 pub fn handle(
-    deps: Deps,
+    deps: DepsMut,
     env: Env,
     info: MessageInfo,
     msg: HandleMsg,
@@ -143,7 +143,7 @@ pub fn handle(
     }
 }
 
-fn do_release(deps: Deps, env: Env, info: MessageInfo) -> Result<HandleResponse, HackError> {
+fn do_release(deps: DepsMut, env: Env, info: MessageInfo) -> Result<HandleResponse, HackError> {
     let data = deps
         .storage
         .get(CONFIG_KEY)
@@ -179,7 +179,7 @@ fn do_cpu_loop() -> Result<HandleResponse, HackError> {
     }
 }
 
-fn do_storage_loop(deps: Deps) -> Result<HandleResponse, HackError> {
+fn do_storage_loop(deps: DepsMut) -> Result<HandleResponse, HackError> {
     let mut test_case = 0u64;
     loop {
         deps.storage
@@ -288,7 +288,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<HandleResponse, HackErro
     Ok(HandleResponse::default())
 }
 
-pub fn query(deps: DepsRef, env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
+pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
     match msg {
         QueryMsg::Verifier {} => to_binary(&query_verifier(deps)?),
         QueryMsg::OtherBalance { address } => to_binary(&query_other_balance(deps, address)?),
@@ -298,7 +298,7 @@ pub fn query(deps: DepsRef, env: Env, msg: QueryMsg) -> StdResult<QueryResponse>
     }
 }
 
-fn query_verifier(deps: DepsRef) -> StdResult<VerifierResponse> {
+fn query_verifier(deps: Deps) -> StdResult<VerifierResponse> {
     let data = deps
         .storage
         .get(CONFIG_KEY)
@@ -308,13 +308,13 @@ fn query_verifier(deps: DepsRef) -> StdResult<VerifierResponse> {
     Ok(VerifierResponse { verifier: addr })
 }
 
-fn query_other_balance(deps: DepsRef, address: HumanAddr) -> StdResult<AllBalanceResponse> {
+fn query_other_balance(deps: Deps, address: HumanAddr) -> StdResult<AllBalanceResponse> {
     let amount = deps.querier.query_all_balances(address)?;
     Ok(AllBalanceResponse { amount })
 }
 
 fn query_recurse(
-    deps: DepsRef,
+    deps: Deps,
     depth: u32,
     work: u32,
     contract: HumanAddr,

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, Deps, DepsRef, Env, HandleResponse, InitResponse,
+    from_slice, to_binary, to_vec, Binary, Deps, DepsMut, Env, HandleResponse, InitResponse,
     MessageInfo, Order, QueryResponse, StdResult,
 };
 
@@ -64,12 +64,17 @@ pub struct ListResponse {
 }
 
 // init is a no-op, just empty data
-pub fn init(_deps: Deps, _env: Env, _info: MessageInfo, _msg: InitMsg) -> StdResult<InitResponse> {
+pub fn init(
+    _deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: InitMsg,
+) -> StdResult<InitResponse> {
     Ok(InitResponse::default())
 }
 
 pub fn handle(
-    deps: Deps,
+    deps: DepsMut,
     _env: Env,
     _info: MessageInfo,
     msg: HandleMsg,
@@ -82,7 +87,7 @@ pub fn handle(
 
 const FIRST_KEY: u8 = 0;
 
-fn enqueue(deps: Deps, value: i32) -> StdResult<HandleResponse> {
+fn enqueue(deps: DepsMut, value: i32) -> StdResult<HandleResponse> {
     // find the last element in the queue and extract key
     let last_item = deps.storage.range(None, None, Order::Descending).next();
 
@@ -98,7 +103,7 @@ fn enqueue(deps: Deps, value: i32) -> StdResult<HandleResponse> {
     Ok(HandleResponse::default())
 }
 
-fn dequeue(deps: Deps) -> StdResult<HandleResponse> {
+fn dequeue(deps: DepsMut) -> StdResult<HandleResponse> {
     // find the first element in the queue and extract value
     let first = deps.storage.range(None, None, Order::Ascending).next();
 
@@ -113,7 +118,7 @@ fn dequeue(deps: Deps) -> StdResult<HandleResponse> {
     }
 }
 
-pub fn query(deps: DepsRef, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
+pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse> {
     match msg {
         QueryMsg::Count {} => to_binary(&query_count(deps)?),
         QueryMsg::Sum {} => to_binary(&query_sum(deps)?),
@@ -122,12 +127,12 @@ pub fn query(deps: DepsRef, _env: Env, msg: QueryMsg) -> StdResult<QueryResponse
     }
 }
 
-fn query_count(deps: DepsRef) -> StdResult<CountResponse> {
+fn query_count(deps: Deps) -> StdResult<CountResponse> {
     let count = deps.storage.range(None, None, Order::Ascending).count() as u32;
     Ok(CountResponse { count })
 }
 
-fn query_sum(deps: DepsRef) -> StdResult<SumResponse> {
+fn query_sum(deps: Deps) -> StdResult<SumResponse> {
     let values: StdResult<Vec<Item>> = deps
         .storage
         .range(None, None, Order::Ascending)
@@ -137,7 +142,7 @@ fn query_sum(deps: DepsRef) -> StdResult<SumResponse> {
     Ok(SumResponse { sum })
 }
 
-fn query_reducer(deps: DepsRef) -> StdResult<ReducerResponse> {
+fn query_reducer(deps: Deps) -> StdResult<ReducerResponse> {
     let mut out: Vec<(i32, i32)> = vec![];
     // val: StdResult<Item>
     for val in deps
@@ -166,7 +171,7 @@ fn query_reducer(deps: DepsRef) -> StdResult<ReducerResponse> {
 
 /// Does a range query with both bounds set. Not really useful but to debug an issue
 /// between VM and Wasm: https://github.com/CosmWasm/cosmwasm/issues/508
-fn query_list(deps: DepsRef) -> StdResult<ListResponse> {
+fn query_list(deps: Deps) -> StdResult<ListResponse> {
     let empty: Vec<u32> = deps
         .storage
         .range(Some(b"large"), Some(b"larger"), Order::Ascending)
@@ -201,11 +206,11 @@ mod tests {
         (deps, info)
     }
 
-    fn get_count(deps: DepsRef) -> u32 {
+    fn get_count(deps: Deps) -> u32 {
         query_count(deps).unwrap().count
     }
 
-    fn get_sum(deps: DepsRef) -> i32 {
+    fn get_sum(deps: Deps) -> i32 {
         query_sum(deps).unwrap().sum
     }
 

contracts/reflect/src/contract.rs

@@ -1,5 +1,5 @@
 use cosmwasm_std::{
-    attr, to_binary, to_vec, Binary, ContractResult, CosmosMsg, Deps, DepsRef, Env, HandleResponse,
+    attr, to_binary, to_vec, Binary, ContractResult, CosmosMsg, Deps, DepsMut, Env, HandleResponse,
     HumanAddr, InitResponse, MessageInfo, QueryRequest, StdError, StdResult, SystemResult,
 };
 
@@ -11,7 +11,7 @@ use crate::msg::{
 use crate::state::{config, config_read, State};
 
 pub fn init(
-    deps: Deps,
+    deps: DepsMut,
     _env: Env,
     info: MessageInfo,
     _msg: InitMsg,
@@ -25,7 +25,7 @@ pub fn init(
 }
 
 pub fn handle(
-    deps: Deps,
+    deps: DepsMut,
     env: Env,
     info: MessageInfo,
     msg: HandleMsg,
@@ -37,7 +37,7 @@ pub fn handle(
 }
 
 pub fn try_reflect(
-    deps: Deps,
+    deps: DepsMut,
     _env: Env,
     info: MessageInfo,
     msgs: Vec<CosmosMsg<CustomMsg>>,
@@ -64,7 +64,7 @@ pub fn try_reflect(
 }
 
 pub fn try_change_owner(
-    deps: Deps,
+    deps: DepsMut,
     _env: Env,
     info: MessageInfo,
     owner: HumanAddr,
@@ -87,7 +87,7 @@ pub fn try_change_owner(
     })
 }
 
-pub fn query(deps: DepsRef, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
+pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     match msg {
         QueryMsg::Owner {} => to_binary(&query_owner(deps)?),
         QueryMsg::Capitalized { text } => to_binary(&query_capitalized(deps, text)?),
@@ -96,21 +96,21 @@ pub fn query(deps: DepsRef, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
     }
 }
 
-fn query_owner(deps: DepsRef) -> StdResult<OwnerResponse> {
+fn query_owner(deps: Deps) -> StdResult<OwnerResponse> {
     let state = config_read(deps.storage.as_readonly()).load()?;
     let resp = OwnerResponse {
         owner: deps.api.human_address(&state.owner)?,
     };
     Ok(resp)
 }
 
-fn query_capitalized(deps: DepsRef, text: String) -> StdResult<CapitalizedResponse> {
+fn query_capitalized(deps: Deps, text: String) -> StdResult<CapitalizedResponse> {
     let req = SpecialQuery::Capitalized { text }.into();
     let response: SpecialResponse = deps.querier.custom_query(&req)?;
     Ok(CapitalizedResponse { text: response.msg })
 }
 
-fn query_chain(deps: DepsRef, request: &QueryRequest<SpecialQuery>) -> StdResult<ChainResponse> {
+fn query_chain(deps: Deps, request: &QueryRequest<SpecialQuery>) -> StdResult<ChainResponse> {
     let raw = to_vec(request).map_err(|serialize_err| {
         StdError::generic_err(format!("Serializing QueryRequest: {}", serialize_err))
     })?;
@@ -127,7 +127,7 @@ fn query_chain(deps: DepsRef, request: &QueryRequest<SpecialQuery>) -> StdResult
     }
 }
 
-fn query_raw(deps: DepsRef, contract: HumanAddr, key: Binary) -> StdResult<RawResponse> {
+fn query_raw(deps: Deps, contract: HumanAddr, key: Binary) -> StdResult<RawResponse> {
     let response: Option<Vec<u8>> = deps.querier.query_wasm_raw(contract, key)?;
     Ok(RawResponse {
         data: response.unwrap_or_default().into(),