Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Serkan Reis committed Jan 27, 2025
1 parent bf909df commit a69769b
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 16 deletions.
1 change: 1 addition & 0 deletions contracts/reserve-auction/src/tests/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ pub mod setup_auctions;
pub mod setup_contracts;
pub mod setup_fair_burn;
pub mod setup_minters;
pub mod setup_royalty_registry;
3 changes: 3 additions & 0 deletions contracts/reserve-auction/src/tests/setup/setup_auctions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ pub fn setup_reserve_auction(
router: &mut StargazeApp,
auction_admin: Addr,
fair_burn: Addr,
royalty_registry: Addr,
) -> Result<Addr, ContractError> {
let reserve_auction_id = router.store_code(contract_reserve_auction());
let msg = InstantiateMsg {
Expand All @@ -39,6 +40,8 @@ pub fn setup_reserve_auction(
coin(MIN_RESERVE_PRICE, NATIVE_DENOM),
coin(MIN_RESERVE_PRICE, DUMMY_DENOM),
],
royalty_registry: royalty_registry.to_string(),
max_royalty_fee_bps: 1000,
};
let auction = router
.instantiate_contract(
Expand Down
9 changes: 9 additions & 0 deletions contracts/reserve-auction/src/tests/setup/setup_contracts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ pub fn contract_fair_burn() -> Box<dyn Contract<StargazeMsgWrapper>> {
Box::new(contract)
}

pub fn contract_royalty_registry() -> Box<dyn Contract<StargazeMsgWrapper>> {
let contract = ContractWrapper::new(
stargaze_royalty_registry::execute::execute,
stargaze_royalty_registry::instantiate::instantiate,
stargaze_royalty_registry::query::query,
);
Box::new(contract)
}

pub fn contract_reserve_auction() -> Box<dyn Contract<StargazeMsgWrapper>> {
let contract = ContractWrapper::new(
crate::execute::execute,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
use super::setup_contracts::contract_royalty_registry;
use cosmwasm_std::{Addr, Decimal};
use cw_multi_test::Executor;
use sg_multi_test::StargazeApp;
use stargaze_royalty_registry::msg::InstantiateMsg as RoyaltyRegistryInstantiateMsg;
use stargaze_royalty_registry::state::Config as RoyaltyRegistryConfig;

pub fn setup_royalty_registry(router: &mut StargazeApp, creator: Addr) -> Addr {
let code_id = router.store_code(contract_royalty_registry());
router
.instantiate_contract(
code_id,
creator.clone(),
&RoyaltyRegistryInstantiateMsg {
config: RoyaltyRegistryConfig {
update_wait_period: 24 * 60 * 60,
max_share_delta: Decimal::percent(10),
},
},
&[],
"RoyaltyRegistry",
None,
)
.unwrap()
}
26 changes: 20 additions & 6 deletions contracts/reserve-auction/src/tests/unit_tests/alt_denom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use crate::tests::{
};
use crate::ContractError;

use crate::tests::setup::setup_royalty_registry::setup_royalty_registry;
use cosmwasm_std::{coin, Coin, Decimal, StdError, Uint128};
use cw_multi_test::Executor;
use regex::Regex;
Expand All @@ -33,7 +34,9 @@ fn try_create_auction() {
let vt = standard_minter_template(1);
let (mut router, creator, _) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -261,7 +264,9 @@ fn try_update_reserve_price() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -366,7 +371,9 @@ fn try_cancel_auction() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -473,7 +480,9 @@ fn try_place_bid() {
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let second_bidder = setup_addtl_account(&mut router, "second_bidder", INITIAL_BALANCE).unwrap();
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -680,7 +689,10 @@ fn try_settle_auction_with_bids() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();

let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -856,7 +868,9 @@ fn try_settle_auction_with_no_bids() {
let vt = standard_minter_template(1);
let (mut router, creator, _bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down
27 changes: 21 additions & 6 deletions contracts/reserve-auction/src/tests/unit_tests/auction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use crate::tests::{
};
use crate::ContractError;

use crate::tests::setup::setup_royalty_registry::setup_royalty_registry;
use cosmwasm_std::{coin, Addr, Decimal, StdError, Uint128};
use cw_multi_test::Executor;
use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg};
Expand Down Expand Up @@ -51,6 +52,8 @@ fn try_instantiate() {
halt_buffer_duration: HALT_BUFFER_DURATION,
halt_postpone_duration: HALT_POSTPONE_DURATION,
min_reserve_prices: vec![coin(MIN_RESERVE_PRICE, NATIVE_DENOM)],
royalty_registry: "royalty_registry".to_string(),
max_royalty_fee_bps: 1000,
};
let auction_addr = instantiate_auction(&mut app, auction_id, msg.clone());

Expand All @@ -74,7 +77,9 @@ fn try_create_auction() {
let vt = standard_minter_template(1);
let (mut router, creator, _) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -302,7 +307,9 @@ fn try_update_reserve_price() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -405,7 +412,9 @@ fn try_cancel_auction() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -510,7 +519,9 @@ fn try_place_bid() {
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let second_bidder = setup_addtl_account(&mut router, "second_bidder", INITIAL_BALANCE).unwrap();
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -706,7 +717,9 @@ fn try_settle_auction_with_bids() {
let vt = standard_minter_template(1);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down Expand Up @@ -892,7 +905,9 @@ fn try_settle_auction_with_no_bids() {
let vt = standard_minter_template(1);
let (mut router, creator, _bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let token_id: u32 = 1;
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::tests::helpers::constants::{
use crate::tests::helpers::nft_functions::{approve, mint};
use crate::tests::setup::setup_accounts::{setup_addtl_account, INITIAL_BALANCE};
use crate::tests::setup::setup_fair_burn::setup_fair_burn;
use crate::tests::setup::setup_royalty_registry::setup_royalty_registry;
use crate::tests::setup::{
setup_auctions::setup_reserve_auction, setup_minters::standard_minter_template,
};
Expand All @@ -21,12 +22,14 @@ fn try_halt_detection() {
let vt = standard_minter_template(1000);
let (mut router, creator, _) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());

let genesis_start_timestamp = Timestamp::from_nanos(GENESIS_MINT_START_TIME);
setup_block_time(&mut router, genesis_start_timestamp.nanos(), None);

// Test that halt manager is instantiated with contract
let reserve_auction = setup_reserve_auction(&mut router, creator, fair_burn).unwrap();
let reserve_auction =
setup_reserve_auction(&mut router, creator, fair_burn, royalty_registry).unwrap();
let halt_manager: HaltManager = router
.wrap()
.query_wasm_smart(reserve_auction.clone(), &QueryMsg::HaltManager {})
Expand Down Expand Up @@ -98,6 +101,7 @@ fn try_postpone_auction() {
let vt = standard_minter_template(1000);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let collection = vt.collection_response_vec[0].collection.clone().unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();

Expand All @@ -108,7 +112,8 @@ fn try_postpone_auction() {
let next_block_timestamp = genesis_timestamp.plus_seconds(DEFAULT_DURATION);
setup_block_time(&mut router, next_block_timestamp.nanos(), None);

let reserve_auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let reserve_auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();

/*
Halt Window
Expand Down
9 changes: 7 additions & 2 deletions contracts/reserve-auction/src/tests/unit_tests/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::tests::{
setup::{setup_auctions::setup_reserve_auction, setup_minters::standard_minter_template},
};

use crate::tests::setup::setup_royalty_registry::setup_royalty_registry;
use cosmwasm_std::coin;
use sg_marketplace_common::query::QueryOptions;
use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM};
Expand All @@ -22,7 +23,9 @@ fn try_query_auctions_by_seller() {
let vt = standard_minter_template(1000);
let (mut router, creator, _) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let reserve_auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let reserve_auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let collection = vt.collection_response_vec[0].collection.clone().unwrap();

Expand Down Expand Up @@ -114,7 +117,9 @@ fn try_query_auctions_by_end_time() {
let vt = standard_minter_template(1000);
let (mut router, creator, bidder) = (vt.router, vt.accts.creator, vt.accts.bidder);
let fair_burn = setup_fair_burn(&mut router, creator.clone());
let reserve_auction = setup_reserve_auction(&mut router, creator.clone(), fair_burn).unwrap();
let royalty_registry = setup_royalty_registry(&mut router, creator.clone());
let reserve_auction =
setup_reserve_auction(&mut router, creator.clone(), fair_burn, royalty_registry).unwrap();
let minter = vt.collection_response_vec[0].minter.clone().unwrap();
let collection = vt.collection_response_vec[0].collection.clone().unwrap();

Expand Down

0 comments on commit a69769b

Please sign in to comment.