fix: refining ext and test contract

contracts/collection-tester/schema/query_msg.json

@@ -135,10 +135,10 @@
  {
  "type": "object",
  "required": [
- "get_nft"
+ "get_nft_count"
  ],
  "properties": {
- "get_nft": {
+ "get_nft_count": {
  "type": "object",
  "required": [
  "contract_id",
@@ -262,6 +262,29 @@
  }
  }
  }
+ },
+ {
+ "type": "object",
+ "required": [
+ "get_approvers"
+ ],
+ "properties": {
+ "get_approvers": {
+ "type": "object",
+ "required": [
+ "contract_id",
+ "proxy"
+ ],
+ "properties": {
+ "contract_id": {
+ "type": "string"
+ },
+ "proxy": {
+ "$ref": "#/definitions/HumanAddr"
+ }
+ }
+ }
+ }
  }
  ],
  "definitions": {

contracts/collection-tester/src/contract.rs

@@ -213,11 +213,11 @@ pub fn query<S: Storage, A: Api, Q: Querier>(
  token_id,
  } => query_token(deps, contract_id, token_id),
  QueryMsg::GetTokens { contract_id } => query_tokens(deps, contract_id),
- QueryMsg::GetNft {
+ QueryMsg::GetNftCount {
  contract_id,
  token_id,
  target,
- } => query_nft(deps, contract_id, token_id, target),
+ } => query_nft_count(deps, contract_id, token_id, target),
  QueryMsg::GetTotal {
  contract_id,
  token_id,
@@ -233,7 +233,8 @@ pub fn query<S: Storage, A: Api, Q: Querier>(
  contract_id,
  proxy,
  approver,
- } => query_approved(deps, contract_id, proxy, approver),
+ } => query_is_approved(deps, contract_id, proxy, approver),
+ QueryMsg::GetApprovers { proxy, contract_id } => query_approvers(deps, proxy, contract_id),
  }
 }
 
@@ -1048,7 +1049,7 @@ fn query_tokens<S: Storage, A: Api, Q: Querier>(
  Ok(out)
 }
 
-fn query_nft<S: Storage, A: Api, Q: Querier>(
+fn query_nft_count<S: Storage, A: Api, Q: Querier>(
  deps: &Extern<S, A, Q>,
  contract_id: String,
  token_id: String,
@@ -1077,11 +1078,25 @@ fn query_total<S: Storage, A: Api, Q: Querier>(
  target_str: String,
 ) -> StdResult<Binary> {
  let target = Target::from_str(&target_str).unwrap();
- let res = LinkCollectionQuerier::new(&deps.querier)
- .query_supply(contract_id, token_id, target)
- .unwrap();
- let out = to_binary(&res)?;
- Ok(out)
+ if Target::Supply == target {
+ let res = LinkCollectionQuerier::new(&deps.querier)
+ .query_supply(contract_id, token_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ } else if Target::Mint == target {
+ let res = LinkCollectionQuerier::new(&deps.querier)
+ .query_mint(contract_id, token_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ } else {
+ let res = LinkCollectionQuerier::new(&deps.querier)
+ .query_burn(contract_id, token_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ }
 }
 
 fn query_root_or_parent_or_children<S: Storage, A: Api, Q: Querier>(
@@ -1123,15 +1138,28 @@ fn query_perms<S: Storage, A: Api, Q: Querier>(
  Ok(out)
 }
 
-fn query_approved<S: Storage, A: Api, Q: Querier>(
+fn query_is_approved<S: Storage, A: Api, Q: Querier>(
  deps: &Extern<S, A, Q>,
  contract_id: String,
  proxy: HumanAddr,
  approver: HumanAddr,
 ) -> StdResult<Binary> {
  let res = LinkCollectionQuerier::new(&deps.querier)
- .query_approved(contract_id, proxy, approver)
+ .query_is_approved(contract_id, proxy, approver)
  .unwrap();
  let out = to_binary(&res)?;
  Ok(out)
 }
+
+fn query_approvers<S: Storage, A: Api, Q: Querier>(
+ deps: &Extern<S, A, Q>,
+ proxy: HumanAddr,
+ contract_id: String,
+) -> StdResult<Binary> {
+ let res = match LinkCollectionQuerier::new(&deps.querier).query_approvers(proxy, contract_id)? {
+ Some(approvers) => approvers,
+ None => return to_binary(&None::<Box<Vec<HumanAddr>>>),
+ };
+ let out = to_binary(&res)?;
+ Ok(out)
+}

contracts/collection-tester/src/msg.rs

@@ -172,7 +172,7 @@ pub enum QueryMsg {
  GetTokens {
  contract_id: String,
  },
- GetNft {
+ GetNftCount {
  contract_id: String,
  token_id: String,
  target: String,
@@ -196,4 +196,8 @@ pub enum QueryMsg {
  proxy: HumanAddr,
  approver: HumanAddr,
  },
+ GetApprovers {
+ proxy: HumanAddr,
+ contract_id: String,
+ },
 }

contracts/token-tester/schema/handle_msg.json

@@ -276,14 +276,22 @@
  "type": "object",
  "required": [
  "contract_id",
- "owner"
+ "key",
+ "owner",
+ "value"
  ],
  "properties": {
  "contract_id": {
  "type": "string"
  },
+ "key": {
+ "type": "string"
+ },
  "owner": {
  "$ref": "#/definitions/HumanAddr"
+ },
+ "value": {
+ "type": "string"
  }
  }
  }

contracts/token-tester/src/contract.rs

@@ -87,7 +87,12 @@ pub fn handle<S: Storage, A: Api, Q: Querier>(
  contract_id,
  permission,
  } => try_revoke_perm(deps, env, from, contract_id, permission),
- HandleMsg::Modify { owner, contract_id } => try_modify(deps, env, owner, contract_id),
+ HandleMsg::Modify {
+ owner,
+ contract_id,
+ key,
+ value,
+ } => try_modify(deps, env, owner, contract_id, key, value),
  HandleMsg::Approve {
  approver,
  contract_id,
@@ -109,7 +114,7 @@ pub fn query<S: Storage, A: Api, Q: Querier>(
  QueryMsg::GetTotal {
  contract_id,
  target,
- } => query_supply(deps, contract_id, target),
+ } => query_total(deps, contract_id, target),
  QueryMsg::GetPerm {
  contract_id,
  address,
@@ -384,8 +389,10 @@ pub fn try_modify<S: Storage, A: Api, Q: Querier>(
  _env: Env,
  owner: HumanAddr,
  contract_id: String,
+ key: String,
+ value: String,
 ) -> HandleResult<LinkMsgWrapper<TokenRoute, TokenMsg>> {
- let change = Change::new("meta".to_string(), "update_token_meta".to_string());
+ let change = Change::new(key, value);
  let msg: CosmosMsg<LinkMsgWrapper<TokenRoute, TokenMsg>> = LinkMsgWrapper {
  module: Module::Tokenencode,
  msg_data: MsgData {
@@ -459,17 +466,31 @@ fn query_balance<S: Storage, A: Api, Q: Querier>(
  Ok(out)
 }
 
-fn query_supply<S: Storage, A: Api, Q: Querier>(
+fn query_total<S: Storage, A: Api, Q: Querier>(
  deps: &Extern<S, A, Q>,
  contract_id: String,
  target_str: String,
 ) -> StdResult<Binary> {
  let target = Target::from_str(&target_str).unwrap();
- let res = LinkTokenQuerier::new(&deps.querier)
- .query_supply(contract_id, target)
- .unwrap();
- let out = to_binary(&res)?;
- Ok(out)
+ if Target::Supply == target {
+ let res = LinkTokenQuerier::new(&deps.querier)
+ .query_supply(contract_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ } else if Target::Mint == target {
+ let res = LinkTokenQuerier::new(&deps.querier)
+ .query_mint(contract_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ } else {
+ let res = LinkTokenQuerier::new(&deps.querier)
+ .query_burn(contract_id)
+ .unwrap();
+ let out = to_binary(&res)?;
+ Ok(out)
+ }
 }
 
 fn query_perm<S: Storage, A: Api, Q: Querier>(

contracts/token-tester/src/msg.rs

@@ -64,6 +64,8 @@ pub enum HandleMsg {
  Modify {
  owner: HumanAddr,
  contract_id: String,
+ key: String,
+ value: String,
  },
  Approve {
  approver: HumanAddr,

packages/ext/Cargo.toml

@@ -12,6 +12,7 @@ readme = "README.md"
 cosmwasm-std = { path = "../std", version = "0.10.0" }
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive", "alloc"] }
+serde_json = "1.0"
 
 [dev-dependencies]
 cosmwasm-schema = { path = "../schema" }

packages/ext/schema/link_msg_wrapper_for__collection_route_and__collection_msg.json

@@ -670,10 +670,10 @@
  },
  "permission": {
  "enum": [
- "Mint",
- "Burn",
- "Issue",
- "Modify"
+ "mint",
+ "burn",
+ "issue",
+ "modify"
  ]
  }
  }