Skip to content

Commit

Permalink
fix: fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
0xFable committed Apr 15, 2024
1 parent 31e1de0 commit 66797ea
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion contracts/liquidity_hub/incentive-manager/src/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub(crate) fn process_incentive_creation_fee(
}

// send incentive creation fee to whale lair for distribution
messages.push(white_whale_std::whale_lair::fill_rewards_msg(
messages.push(white_whale_std::whale_lair::fill_rewards_msg_coin(
config.whale_lair_addr.clone().into_string(),
vec![incentive_creation_fee.to_owned()],
)?);
Expand Down
4 changes: 2 additions & 2 deletions contracts/liquidity_hub/pool-manager/src/manager/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use cosmwasm_std::{
use white_whale_std::{
fee::PoolFee,
pool_network::{asset::PairType, querier::query_native_decimals},
whale_lair::fill_rewards_msg,
whale_lair::{fill_rewards_msg, fill_rewards_msg_coin},
};

use crate::state::{get_pair_by_identifier, NATIVE_TOKEN_DECIMALS, PAIR_COUNTER};
Expand Down Expand Up @@ -110,7 +110,7 @@ pub fn create_pair(
let creation_fee = vec![config.pool_creation_fee];

// send pair creation fee to whale lair i.e the new fee_collector
messages.push(fill_rewards_msg(
messages.push(fill_rewards_msg_coin(
config.whale_lair_addr.into_string(),
creation_fee,
)?);
Expand Down
6 changes: 2 additions & 4 deletions packages/white-whale-std/src/bonding_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ pub struct Config {
pub bonding_assets: Vec<String>,
/// The duration of the grace period in epochs, i.e. how many expired epochs can be claimed
pub grace_period: Uint64,

}

#[cw_serde]
Expand Down Expand Up @@ -85,7 +84,7 @@ pub struct InstantiateMsg {
pub growth_rate: Decimal,
/// [String] denoms of the assets that can be bonded.
pub bonding_assets: Vec<String>,
/// Grace period the maximum age of a bucket before fees are forwarded from it
/// Grace period the maximum age of a bucket before fees are forwarded from it
pub grace_period: Uint64,
}

Expand All @@ -97,8 +96,7 @@ pub struct EpochChangedHookMsg {
#[cw_serde]
pub enum ExecuteMsg {
/// Bonds the specified [Asset].
Bond {
},
Bond {},
/// Unbonds the specified [Asset].
Unbond {
asset: Coin,
Expand Down
3 changes: 1 addition & 2 deletions packages/white-whale-std/src/coin.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

use std::collections::HashMap;

use cosmwasm_std::{Coin, StdError, StdResult, Uint128};
Expand Down Expand Up @@ -160,7 +159,7 @@ fn get_factory_token_label(denom: &str) -> StdResult<String> {
}

//todo test these functions in isolation
// move to ww package
// move to ww package
pub fn deduct_coins(coins: Vec<Coin>, to_deduct: Vec<Coin>) -> StdResult<Vec<Coin>> {
let mut updated_coins = coins.to_vec();

Expand Down
2 changes: 1 addition & 1 deletion packages/white-whale-std/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pub mod pool_manager;
pub mod pool_network;
pub mod token_factory;

pub mod coin;
pub mod bonding_manager;
pub mod coin;

#[cfg(any(
feature = "token_factory",
Expand Down
3 changes: 1 addition & 2 deletions packages/white-whale-std/src/whale_lair.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::pool_network::asset::{Asset, AssetInfo, ToCoins};
use cosmwasm_schema::{cw_serde, QueryResponses};
use cosmwasm_std::{
to_json_binary, Addr, Coin, CosmosMsg, Decimal, StdResult, Timestamp, Uint128, Uint64, WasmMsg
to_json_binary, Addr, Coin, CosmosMsg, Decimal, StdResult, Timestamp, Uint128, Uint64, WasmMsg,
};

#[cw_serde]
Expand Down Expand Up @@ -88,7 +88,6 @@ pub enum ExecuteMsg {
/// Fills the whale lair with new rewards.
FillRewards { assets: Vec<Asset> },
/// Fills the whale lair with new rewards.
FillRewardsCoin,
}

Expand Down

0 comments on commit 66797ea

Please sign in to comment.