diff --git a/Cargo.lock b/Cargo.lock index 58f78d1..6b407eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2217,7 +2217,6 @@ dependencies = [ "schemars", "serde", "sg-multi-test", - "sg-name", "sg-std", "stargaze-vip-collection", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 3b2a9ba..759f0ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ serde_json = "1.0" env_logger = "0.9.0" test-context = "0.1.4" once_cell = "1.13.0" -rand = "0.8" +rand = "0.8.5" itertools = "0.10.5" [profile.release] diff --git a/contracts/vip/minter/Cargo.toml b/contracts/vip/minter/Cargo.toml index b3f56b4..92b3020 100644 --- a/contracts/vip/minter/Cargo.toml +++ b/contracts/vip/minter/Cargo.toml @@ -43,9 +43,7 @@ cw721-base = { workspace = true } schemars = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } -sg-multi-test = { workspace = true } sg-std = { workspace = true } -sg-name = "1.2.5" stargaze-vip-collection = { path = "../collection", features = ["library"] } [dev-dependencies] diff --git a/contracts/vip/minter/src/contract.rs b/contracts/vip/minter/src/contract.rs index 1b58316..40f294e 100644 --- a/contracts/vip/minter/src/contract.rs +++ b/contracts/vip/minter/src/contract.rs @@ -4,7 +4,8 @@ use std::env; use cosmwasm_std::entry_point; use cosmwasm_std::{ ensure, instantiate2_address, to_binary, Addr, Binary, CodeInfoResponse, ContractInfoResponse, - Deps, DepsMut, Env, Event, MessageInfo, Response, StdError, StdResult, Timestamp, Uint128, WasmMsg, + Deps, DepsMut, Env, Event, MessageInfo, Response, StdError, StdResult, Timestamp, Uint128, + WasmMsg, }; use cw2::set_contract_version; @@ -250,45 +251,4 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult { #[cfg(test)] mod tests { - use crate::msg::InstantiateMsg; - use cosmwasm_std::{to_binary, Addr, Event, WasmMsg, Empty}; - use cw_multi_test::{App, Contract, ContractWrapper, Executor}; - - fn minter_contract() -> Box> { - let contract = ContractWrapper::new(super::instantiate, super::execute, super::query); - Box::new(contract) - } - - fn collection_contract() -> Box> { - let contract = ContractWrapper::new( - stargaze_vip_collection::contract::execute, - stargaze_vip_collection::contract::instantiate, - stargaze_vip_collection::contract::query, - ); - Box::new(contract) - } - #[test] - fn try_instantiate() { - let mut app = App::default(); - let minter_code_id = app.store_code(minter_contract()); - let collection_code_id = app.store_code(collection_contract()); - - let creator = Addr::unchecked("creator"); - - let init_msg = InstantiateMsg { - collection_code_id, - update_interval: 100, - }; - let msg = WasmMsg::Instantiate { - admin: None, - code_id: minter_code_id, - msg: to_binary(&init_msg).unwrap(), - funds: vec![], - label: "vip-minter".to_string(), - }; - let response = app.execute(creator, msg.into()); - - assert!(response.is_ok()); - assert!(response.unwrap().has_event(&Event::new("instantiate"))); - } }