Skip to content

Commit

Permalink
Merge pull request #450 from andromedaprotocol/feat/crowdfund-restruc…
Browse files Browse the repository at this point in the history 
…ture/tier-management

feat: instantiation, tier management and start campaign enabled
  • Loading branch information
@cowboy0015
cowboy0015 authored May 10, 2024
2 parents 11e545d + 83b91a5 commit da9d6c7
Show file tree
Hide file tree
Showing 9 changed files with 3,764 additions and 3,467 deletions.
1,621 changes: 871 additions & 750 deletions contracts/non-fungible-tokens/andromeda-crowdfund/src/contract.rs
View file

Large diffs are not rendered by default.

296 changes: 143 additions & 153 deletions contracts/non-fungible-tokens/andromeda-crowdfund/src/mock.rs
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
#![cfg(all(not(target_arch = "wasm32"), feature = "testing"))]

use crate::contract::{execute, instantiate, query, reply};
use andromeda_non_fungible_tokens::{
crowdfund::{CrowdfundMintMsg, ExecuteMsg, InstantiateMsg, QueryMsg},
cw721::TokenExtension,
};
use andromeda_std::{
ado_base::modules::Module,
amp::{AndrAddr, Recipient},
common::expiration::Expiry,
use andromeda_non_fungible_tokens::crowdfund::{
CampaignConfig, ExecuteMsg, InstantiateMsg, QueryMsg, Tier,
};
use andromeda_std::ado_base::modules::Module;
use andromeda_testing::{
mock::MockApp,
mock_ado,
mock_contract::{ExecuteResult, MockADO, MockContract},
mock_contract::{MockADO, MockContract},
};
use cosmwasm_std::{Addr, Coin, Empty, Uint128};
use cosmwasm_std::{Addr, Empty};
use cw_multi_test::{Contract, ContractWrapper, Executor};

pub struct MockCrowdfund(Addr);
Expand All @@ -27,19 +22,14 @@ impl MockCrowdfund {
code_id: u64,
sender: Addr,
app: &mut MockApp,
token_address: AndrAddr,
can_mint_after_sale: bool,
campaign_config: CampaignConfig,
tiers: Vec<Tier>,
modules: Option<Vec<Module>>,
kernel_address: impl Into<String>,
owner: Option<String>,
) -> MockCrowdfund {
let msg = mock_crowdfund_instantiate_msg(
token_address,
can_mint_after_sale,
modules,
kernel_address,
owner,
);
let msg =
mock_crowdfund_instantiate_msg(campaign_config, tiers, modules, kernel_address, owner);
let addr = app
.instantiate_contract(
code_id,
Expand All @@ -53,75 +43,75 @@ impl MockCrowdfund {
MockCrowdfund(Addr::unchecked(addr))
}

#[allow(clippy::too_many_arguments)]
pub fn execute_start_sale(
&self,
sender: Addr,
app: &mut MockApp,
start_time: Option<Expiry>,
end_time: Expiry,
price: Coin,
min_tokens_sold: Uint128,
max_amount_per_wallet: Option<u32>,
recipient: Recipient,
) -> ExecuteResult {
let msg = mock_start_crowdfund_msg(
start_time,
end_time,
price,
min_tokens_sold,
max_amount_per_wallet,
recipient,
);
self.execute(app, &msg, sender, &[])
}

pub fn execute_end_sale(
&self,
sender: Addr,
app: &mut MockApp,
limit: Option<u32>,
) -> ExecuteResult {
let msg = mock_end_crowdfund_msg(limit);
self.execute(app, &msg, sender, &[])
}

pub fn execute_mint(
&self,
sender: Addr,
app: &mut MockApp,
token_id: String,
extension: TokenExtension,
token_uri: Option<String>,
owner: Option<String>,
) -> ExecuteResult {
let msg = ExecuteMsg::Mint(vec![mock_crowdfund_mint_msg(
token_id, extension, token_uri, owner,
)]);
self.execute(app, &msg, sender, &[])
}

pub fn execute_quick_mint(
&self,
sender: Addr,
app: &mut MockApp,
amount: u32,
publisher: String,
) -> ExecuteResult {
let msg = mock_crowdfund_quick_mint_msg(amount, publisher);
self.execute(app, &msg, sender, &[])
}

pub fn execute_purchase(
&self,
sender: Addr,
app: &mut MockApp,
number_of_tokens: Option<u32>,
funds: &[Coin],
) -> ExecuteResult {
let msg = mock_purchase_msg(number_of_tokens);
self.execute(app, &msg, sender, funds)
}
// #[allow(clippy::too_many_arguments)]
// pub fn execute_start_sale(
// &self,
// sender: Addr,
// app: &mut MockApp,
// start_time: Option<Expiry>,
// end_time: Expiry,
// price: Coin,
// min_tokens_sold: Uint128,
// max_amount_per_wallet: Option<u32>,
// recipient: Recipient,
// ) -> ExecuteResult {
// let msg = mock_start_crowdfund_msg(
// start_time,
// end_time,
// price,
// min_tokens_sold,
// max_amount_per_wallet,
// recipient,
// );
// self.execute(app, &msg, sender, &[])
// }

// pub fn execute_end_sale(
// &self,
// sender: Addr,
// app: &mut MockApp,
// limit: Option<u32>,
// ) -> ExecuteResult {
// let msg = mock_end_crowdfund_msg(limit);
// self.execute(app, &msg, sender, &[])
// }

// pub fn execute_mint(
// &self,
// sender: Addr,
// app: &mut MockApp,
// token_id: String,
// extension: TokenExtension,
// token_uri: Option<String>,
// owner: Option<String>,
// ) -> ExecuteResult {
// let msg = ExecuteMsg::Mint(vec![mock_crowdfund_mint_msg(
// token_id, extension, token_uri, owner,
// )]);
// self.execute(app, &msg, sender, &[])
// }

// pub fn execute_quick_mint(
// &self,
// sender: Addr,
// app: &mut MockApp,
// amount: u32,
// publisher: String,
// ) -> ExecuteResult {
// let msg = mock_crowdfund_quick_mint_msg(amount, publisher);
// self.execute(app, &msg, sender, &[])
// }

// pub fn execute_purchase(
// &self,
// sender: Addr,
// app: &mut MockApp,
// number_of_tokens: Option<u32>,
// funds: &[Coin],
// ) -> ExecuteResult {
// let msg = mock_purchase_msg(number_of_tokens);
// self.execute(app, &msg, sender, funds)
// }
}

pub fn mock_andromeda_crowdfund() -> Box<dyn Contract<Empty>> {
Expand All @@ -130,79 +120,79 @@ pub fn mock_andromeda_crowdfund() -> Box<dyn Contract<Empty>> {
}

pub fn mock_crowdfund_instantiate_msg(
token_address: AndrAddr,
can_mint_after_sale: bool,
campaign_config: CampaignConfig,
tiers: Vec<Tier>,
modules: Option<Vec<Module>>,
kernel_address: impl Into<String>,
owner: Option<String>,
) -> InstantiateMsg {
InstantiateMsg {
token_address,
can_mint_after_sale,
campaign_config,
tiers,
modules,
kernel_address: kernel_address.into(),
owner,
}
}

pub fn mock_start_crowdfund_msg(
start_time: Option<Expiry>,
end_time: Expiry,
price: Coin,
min_tokens_sold: Uint128,
max_amount_per_wallet: Option<u32>,
recipient: Recipient,
) -> ExecuteMsg {
ExecuteMsg::StartSale {
start_time,
end_time,
price,
min_tokens_sold,
max_amount_per_wallet,
recipient,
}
}

pub fn mock_end_crowdfund_msg(limit: Option<u32>) -> ExecuteMsg {
ExecuteMsg::EndSale { limit }
}

pub fn mock_crowdfund_mint_msg(
token_id: String,
extension: TokenExtension,
token_uri: Option<String>,
owner: Option<String>,
) -> CrowdfundMintMsg {
CrowdfundMintMsg {
token_id,
owner,
token_uri,
extension,
}
}

pub fn mock_crowdfund_quick_mint_msg(amount: u32, publisher: String) -> ExecuteMsg {
let mut mint_msgs: Vec<CrowdfundMintMsg> = Vec::new();
for i in 0..amount {
let extension = TokenExtension {
publisher: publisher.clone(),
};

let msg = mock_crowdfund_mint_msg(i.to_string(), extension, None, None);
mint_msgs.push(msg);
}

ExecuteMsg::Mint(mint_msgs)
}

pub fn mock_purchase_msg(number_of_tokens: Option<u32>) -> ExecuteMsg {
ExecuteMsg::Purchase { number_of_tokens }
}

pub fn mock_query_ado_base_version() -> QueryMsg {
QueryMsg::ADOBaseVersion {}
}

pub fn mock_query_ado_version() -> QueryMsg {
QueryMsg::Version {}
}
// pub fn mock_start_crowdfund_msg(
// start_time: Option<Expiry>,
// end_time: Expiry,
// price: Coin,
// min_tokens_sold: Uint128,
// max_amount_per_wallet: Option<u32>,
// recipient: Recipient,
// ) -> ExecuteMsg {
// ExecuteMsg::StartSale {
// start_time,
// end_time,
// price,
// min_tokens_sold,
// max_amount_per_wallet,
// recipient,
// }
// }

// pub fn mock_end_crowdfund_msg(limit: Option<u32>) -> ExecuteMsg {
// ExecuteMsg::EndSale { limit }
// }

// pub fn mock_crowdfund_mint_msg(
// token_id: String,
// extension: TokenExtension,
// token_uri: Option<String>,
// owner: Option<String>,
// ) -> CrowdfundMintMsg {
// CrowdfundMintMsg {
// token_id,
// owner,
// token_uri,
// extension,
// }
// }

// pub fn mock_crowdfund_quick_mint_msg(amount: u32, publisher: String) -> ExecuteMsg {
// let mut mint_msgs: Vec<CrowdfundMintMsg> = Vec::new();
// for i in 0..amount {
// let extension = TokenExtension {
// publisher: publisher.clone(),
// };

// let msg = mock_crowdfund_mint_msg(i.to_string(), extension, None, None);
// mint_msgs.push(msg);
// }

// ExecuteMsg::Mint(mint_msgs)
// }

// pub fn mock_purchase_msg(number_of_tokens: Option<u32>) -> ExecuteMsg {
// ExecuteMsg::Purchase { number_of_tokens }
// }

// pub fn mock_query_ado_base_version() -> QueryMsg {
// QueryMsg::ADOBaseVersion {}
// }

// pub fn mock_query_ado_version() -> QueryMsg {
// QueryMsg::Version {}
// }
Loading

0 comments on commit da9d6c7

Please sign in to comment.