Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions contracts/citizen-science-registry/src/contract.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::agent_registry::{
serialize_policy, validate_agent_name, validate_pubkey, Agent, AgentType,
Agent, AgentType, serialize_policy, validate_agent_name, validate_pubkey,
};
use crate::constants::{
ADMIN, AGENT_BY_OPERATOR, AGENTS, DATA_ENTRIES, DATA_HASHES, DEFAULT_DENOM, DENOM,
Expand All @@ -15,7 +15,6 @@ use sha2::{Digest, Sha256};
use sylvia::contract;
use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
use sylvia::cw_std::{Addr, BankMsg, Coin, Order, Response, StdResult};
use sylvia::entry_points;

#[cw_serde]
pub struct Sensor {
Expand Down
1 change: 0 additions & 1 deletion contracts/community-bounty/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use serde_json::{Value, to_string};
use sylvia::contract;
use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
use sylvia::cw_std::{Addr, BankMsg, Coin, Order, Response, StdResult, Uint128};
use sylvia::entry_points;

#[cw_serde]
pub enum BountyStatus {
Expand Down
4 changes: 1 addition & 3 deletions contracts/cross-platform-exchange/src/bin/schema.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use cross_platform_exchange::contract::sv::{
ContractExecMsg, ContractQueryMsg, InstantiateMsg,
};
use cosmwasm_schema::write_api;
use cross_platform_exchange::contract::sv::{ContractExecMsg, ContractQueryMsg, InstantiateMsg};

fn main() {
write_api! {
Expand Down
5 changes: 1 addition & 4 deletions contracts/cross-platform-exchange/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,7 @@ fn normalize_partner_denom(denom: &str) -> StdResult<String> {
Ok(trimmed.to_string())
}

fn load_active_partner(
storage: &dyn sylvia::cw_std::Storage,
key: &str,
) -> StdResult<PartnerInfo> {
fn load_active_partner(storage: &dyn sylvia::cw_std::Storage, key: &str) -> StdResult<PartnerInfo> {
let partner = PARTNERS
.load(storage, key.to_string())
.map_err(|_| ContractError::PartnerNotFound)?;
Expand Down
6 changes: 2 additions & 4 deletions contracts/cross-platform-exchange/src/multitest/mod.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#[cfg(test)]
mod tests {
use crate::constants::DEFAULT_DENOM;
use crate::contract::SwapDirection;
use crate::contract::sv::mt::CodeId;
use crate::contract::sv::mt::CrossPlatformExchangeContractProxy;
use crate::contract::SwapDirection;
use crate::errors::ContractError;
use sylvia::cw_multi_test::{App as MtApp, BankSudo, IntoAddr, SudoMsg};
use sylvia::cw_std::{Uint128, coin};
Expand Down Expand Up @@ -274,9 +274,7 @@ mod tests {
assert_eq!(partners.len(), 1);
assert_eq!(partners[0].region, "Nashik, Maharashtra, India");

let rate = contract
.get_rate("nashik-aqua-unit".to_string())
.unwrap();
let rate = contract.get_rate("nashik-aqua-unit".to_string()).unwrap();
assert_eq!(rate.base_amount, Uint128::new(1000));
assert_eq!(rate.partner_amount, Uint128::new(25));
}
Expand Down
20 changes: 13 additions & 7 deletions contracts/local-dao/src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ pub const ACTION_POST_BOUNTY: &str = "post_bounty";
pub const ACTION_MINT_CREDITS: &str = "mint_credits";
pub const ACTION_REWARD_SENSOR: &str = "reward_sensor";

pub const ALLOWED_ACTIONS: [&str; 3] =
[ACTION_POST_BOUNTY, ACTION_MINT_CREDITS, ACTION_REWARD_SENSOR];
pub const ALLOWED_ACTIONS: [&str; 3] = [
ACTION_POST_BOUNTY,
ACTION_MINT_CREDITS,
ACTION_REWARD_SENSOR,
];

#[cw_serde]
struct PostBountyMetadata {
Expand All @@ -41,7 +44,10 @@ pub fn is_allowed_action(action_tag: &str) -> bool {
ALLOWED_ACTIONS.contains(&action_tag)
}

pub fn action_target_configured(storage: &dyn Storage, action_tag: &str) -> Result<(), ContractError> {
pub fn action_target_configured(
storage: &dyn Storage,
action_tag: &str,
) -> Result<(), ContractError> {
let configured = match action_tag {
ACTION_POST_BOUNTY => COMMUNITY_BOUNTY.may_load(storage)?.is_some(),
ACTION_MINT_CREDITS => WATER_CREDIT_MARKETPLACE.may_load(storage)?.is_some(),
Expand Down Expand Up @@ -99,11 +105,11 @@ pub fn build_execute_message(
let denom = DEFAULT_DENOM.load(storage)?;

match proposal.action_tag.as_str() {
ACTION_POST_BOUNTY => build_post_bounty(storage, proposal, &metadata, attached_funds, &denom),
ACTION_MINT_CREDITS => build_mint_credits(storage, &metadata),
ACTION_REWARD_SENSOR => {
build_reward_sensor(storage, &metadata, attached_funds, &denom)
ACTION_POST_BOUNTY => {
build_post_bounty(storage, proposal, &metadata, attached_funds, &denom)
}
ACTION_MINT_CREDITS => build_mint_credits(storage, &metadata),
ACTION_REWARD_SENSOR => build_reward_sensor(storage, &metadata, attached_funds, &denom),
_ => Err(ContractError::UnsupportedAction),
}
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/local-dao/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::constants::{
use crate::errors::ContractError;
use cosmwasm_schema::cw_serde;
use cw_storage_plus::Bound;
use serde_json::{to_string, Value};
use serde_json::{Value, to_string};
use sylvia::contract;
use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
use sylvia::cw_std::{Addr, CosmosMsg, Order, Response, StdResult};
Expand Down
48 changes: 26 additions & 22 deletions contracts/local-dao/src/multitest/mod.rs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#[cfg(test)]
mod tests {
use crate::actions::{ACTION_MINT_CREDITS, ACTION_POST_BOUNTY};
use crate::contract::LocalDaoContract;
use crate::contract::sv::mt::CodeId;
use crate::contract::sv::mt::LocalDaoContractProxy;
use crate::contract::LocalDaoContract;
use crate::contract::{InstantiateConfig, ProposalStatus, VoteOption};
use crate::errors::ContractError;
use community_bounty::contract::sv::mt::CodeId as BountyCodeId;
use community_bounty::contract::sv::mt::CommunityBountyContractProxy;
use community_bounty::contract::BountyStatus;
use community_bounty::contract::CommunityBountyContract;
use community_bounty::contract::sv::mt::CodeId as BountyCodeId;
use community_bounty::contract::sv::mt::CommunityBountyContractProxy;
use serde_json::json;
use sylvia::cw_multi_test::{App as MtApp, BankSudo, IntoAddr, SudoMsg};
use sylvia::cw_std::{coin, Timestamp, Uint128};
use sylvia::cw_std::{Timestamp, Uint128, coin};
use sylvia::multitest::App;
use sylvia::multitest::Proxy;
use water_credit_marketplace::contract::WaterCreditMarketplaceContract;
use water_credit_marketplace::contract::sv::mt::CodeId as WcmCodeId;
use water_credit_marketplace::contract::sv::mt::WaterCreditMarketplaceContractProxy;
use water_credit_marketplace::contract::WaterCreditMarketplaceContract;

const TEST_DENOM: &str = "ustake";

Expand Down Expand Up @@ -151,10 +151,11 @@ mod tests {

let dup = contract.vote(1, VoteOption::No).call(&voter);
assert!(dup.is_err());
assert!(dup
.unwrap_err()
.to_string()
.contains(&ContractError::AlreadyVoted.to_string()));
assert!(
dup.unwrap_err()
.to_string()
.contains(&ContractError::AlreadyVoted.to_string())
);
}

#[test]
Expand All @@ -173,10 +174,11 @@ mod tests {
)
.call(&proposer);
assert!(err.is_err());
assert!(err
.unwrap_err()
.to_string()
.contains(&ContractError::UnsupportedAction.to_string()));
assert!(
err.unwrap_err()
.to_string()
.contains(&ContractError::UnsupportedAction.to_string())
);
}

#[test]
Expand All @@ -198,10 +200,11 @@ mod tests {

let err = contract.execute_proposal(1).call(&proposer);
assert!(err.is_err());
assert!(err
.unwrap_err()
.to_string()
.contains(&ContractError::VotingNotEnded.to_string()));
assert!(
err.unwrap_err()
.to_string()
.contains(&ContractError::VotingNotEnded.to_string())
);
}

#[test]
Expand Down Expand Up @@ -299,7 +302,7 @@ mod tests {
"Mint cleanup credits".to_string(),
"Reward verified river stewards with tradable credits.".to_string(),
ACTION_MINT_CREDITS.to_string(),
mint_metadata(&beneficiary.to_string(), "75"),
mint_metadata(beneficiary.as_ref(), "75"),
)
.call(&proposer)
.unwrap();
Expand Down Expand Up @@ -346,10 +349,11 @@ mod tests {
.with_funds(&[coin(400, TEST_DENOM)])
.call(&proposer);
assert!(err.is_err());
assert!(err
.unwrap_err()
.to_string()
.contains(&ContractError::InvalidFundsAmount.to_string()));
assert!(
err.unwrap_err()
.to_string()
.contains(&ContractError::InvalidFundsAmount.to_string())
);
}

#[test]
Expand Down
1 change: 0 additions & 1 deletion contracts/water-credit-marketplace/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use cw_storage_plus::Bound;
use sylvia::contract;
use sylvia::ctx::{ExecCtx, InstantiateCtx, QueryCtx};
use sylvia::cw_std::{Addr, BankMsg, Coin, Order, Response, StdResult, Uint128};
use sylvia::entry_points;

#[cw_serde]
pub struct CreditListing {
Expand Down
Loading