Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cw1-subkeys-ng: Additional follow up improvements #506

Merged
merged 4 commits into from
Oct 25, 2021
Merged

cw1-subkeys-ng: Additional follow up improvements #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1602156
cw1-subkeys-ng: Additional follow up improvements
hashedone Oct 22, 2021
1de1d94
cw1-subkeys-ng: Simplified some bounds to CustomMsg
hashedone Oct 22, 2021
de1d0ab
cw1-subkeys-ng: Fix mistakes
hashedone Oct 22, 2021
f44b912
cw1-subkeys-ng: Removed obsolete feature flag
hashedone Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contracts/cw1-whitelist-ng/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ backtraces = ["cosmwasm-std/backtraces"]
# use library feature to disable all instantiate/execute/query exports
library = []
test-utils = []
querier = ["library"]
# generate multitest interfaces
multitest = ["cw-multi-test", "anyhow"]

Expand Down
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist-ng/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub mod query;
pub mod state;

#[cfg(not(feature = "library"))]
mod binary {
mod entry_points {
use crate::error::ContractError;
use crate::state::Cw1WhitelistContract;
use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Response};
Expand Down Expand Up @@ -41,4 +41,4 @@ mod binary {
}

#[cfg(not(feature = "library"))]
pub use binary::*;
pub use entry_points::*;
4 changes: 2 additions & 2 deletions contracts/cw1-whitelist-ng/src/multitest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ mod test {

let proxy = Cw1WhitelistProxy::instantiate(&mut app, contract_id, &owner, &[])
.with_label("Proxy")
.with(vec![owner.to_string()], true)
.with_args(vec![owner.to_string()], true)
.unwrap();

let remote = Cw1WhitelistProxy::instantiate(&mut app, contract_id, &owner, &[])
.with_label("Remote")
.with(vec![proxy.addr().into()], true)
.with_args(vec![proxy.addr().into()], true)
.unwrap();

assert_ne!(proxy, remote);
Expand Down
12 changes: 6 additions & 6 deletions contracts/cw1-whitelist-ng/src/multitest/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ use crate::msg::*;
use crate::query::*;
use crate::state::Cw1WhitelistContract;
use anyhow::{bail, Result as AnyResult};
use cosmwasm_std::CustomMsg;
use cosmwasm_std::{
Addr, Binary, Coin, CosmosMsg, CustomQuery, DepsMut, Env, MessageInfo, QuerierWrapper, Reply,
Response,
};
use cw_multi_test::{AppResponse, Contract, Executor};
use schemars::JsonSchema;
use serde::de::DeserializeOwned;
use serde::Serialize;

impl<T> Contract<T> for Cw1WhitelistContract<T>
where
Expand Down Expand Up @@ -75,7 +75,7 @@ impl<'a, App> Cw1Executor<'a, App> {

pub fn execute<C>(self, msgs: Vec<CosmosMsg<C>>) -> AnyResult<AppResponse>
where
C: Clone + std::fmt::Debug + PartialEq + JsonSchema + Serialize + 'static,
C: CustomMsg + 'static,
App: Executor<C>,
{
self.app.execute_contract(
Expand Down Expand Up @@ -108,7 +108,7 @@ impl<'a, App> WhitelistExecutor<'a, App> {

pub fn freeze<C>(self) -> AnyResult<AppResponse>
where
C: Clone + std::fmt::Debug + PartialEq + JsonSchema + Serialize + 'static,
C: CustomMsg + 'static,
App: Executor<C>,
{
self.app.execute_contract(
Expand All @@ -121,7 +121,7 @@ impl<'a, App> WhitelistExecutor<'a, App> {

pub fn update_admins<C>(self, admins: Vec<String>) -> AnyResult<AppResponse>
where
C: Clone + std::fmt::Debug + PartialEq + JsonSchema + 'static + Serialize,
C: CustomMsg + 'static,
App: Executor<C>,
{
self.app.execute_contract(
Expand Down Expand Up @@ -166,9 +166,9 @@ impl<'a, App> Instantiator<'a, App> {
self
}

pub fn with<C>(self, admins: Vec<String>, mutable: bool) -> AnyResult<Cw1WhitelistProxy>
pub fn with_args<C>(self, admins: Vec<String>, mutable: bool) -> AnyResult<Cw1WhitelistProxy>
where
C: Clone + std::fmt::Debug + PartialEq + JsonSchema + 'static,
C: CustomMsg + 'static,
App: Executor<C>,
{
let addr = self.app.instantiate_contract(
Expand Down