remove unexistant query (#332)

politeWall · cosmic-vagabond · web-flow · commit 9745e5d7e305 · 2024-05-27T23:23:34.000+02:00
fix: 🐛 remove unexistant query

Co-authored-by: Cosmic Vagabond &lt;121588426+cosmic-vagabond@users.noreply.github.com&gt;
diff --git a/bindings-test/src/multitest.rs b/bindings-test/src/multitest.rs
@@ -564,13 +564,6 @@ impl Module for ElysModule {
                 };
                 Ok(to_json_binary(&resp)?)
             }
-            ElysQuery::CommitmentRewardsSubBucketBalanceOfDenom { .. } => {
-                let resp = BalanceAvailable {
-                    amount: Uint128::new(100),
-                    usd_amount: Decimal::from_atomics(Uint128::new(100), 0).unwrap(),
-                };
-                Ok(to_json_binary(&resp)?)
-            }
             ElysQuery::CommitmentStakedBalanceOfDenom { .. } => {
                 // This is returning the same staked balance for each staking program (Usdc program, eden program, elys program, etc.).
                 let resp = BalanceAvailable {
diff --git a/bindings/src/account_history/msg/query.rs b/bindings/src/account_history/msg/query.rs
@@ -107,14 +107,6 @@ pub enum QueryMsg {
     #[returns(QueryUnstakedPositionResponse)]
     CommitmentUnStakedPositions { delegator_address: String },
 
-    #[cfg(feature = "debug")]
-    #[returns(BalanceAvailable)]
-    CommitmentRewardsSubBucketBalanceOfDenom {
-        address: String,
-        denom: String,
-        program: i32,
-    },
-
     #[cfg(feature = "debug")]
     #[returns(StakedAvailable)]
     CommitmentStakedBalanceOfDenom { address: String, denom: String },
diff --git a/bindings/src/msg.rs b/bindings/src/msg.rs
@@ -10,21 +10,7 @@ use crate::{
 
 #[cw_serde]
 pub enum ElysMsg {
-    PerpetualOpen {
-        creator: String,
-        position: i32,
-        collateral: Coin,
-        trading_asset: String,
-        leverage: SignedDecimal,
-        take_profit_price: SignedDecimal256,
-        owner: String,
-    },
-    PerpetualClose {
-        creator: String,
-        id: u64,
-        amount: Int128,
-        owner: String,
-    },
+    // Amm
     AmmSwapExactAmountIn {
         sender: String,
         routes: Vec<SwapAmountInRoute>,
@@ -43,6 +29,22 @@ pub enum ElysMsg {
         discount: Decimal,
         recipient: String,
     },
+    AmmJoinPool {
+        sender: String,
+        pool_id: u64,
+        max_amounts_in: Vec<Coin>,
+        share_amount_out: Uint128,
+        no_remaining: bool,
+    },
+    AmmExitPool {
+        sender: String,
+        pool_id: u64,
+        min_amounts_out: Vec<Coin>,
+        share_amount_in: Uint128,
+        token_out_denom: String,
+    },
+
+    // Commitment
     CommitmentStake {
         creator: String,
         amount: Int128,
@@ -55,18 +57,6 @@ pub enum ElysMsg {
         asset: String,
         validator_address: Option<String>,
     },
-    IncentiveBeginRedelegate {
-        delegator_address: String,
-        validator_src_address: String,
-        validator_dst_address: String,
-        amount: Coin,
-    },
-    IncentiveCancelUnbondingDelegation {
-        delegator_address: String,
-        validator_address: String,
-        amount: Coin,
-        creation_height: i64,
-    },
     CommitmentVest {
         creator: String,
         amount: Int128,
@@ -80,21 +70,37 @@ pub enum ElysMsg {
     CommitmentClaimVesting {
         sender: String,
     },
-    AmmJoinPool {
-        sender: String,
-        pool_id: u64,
-        max_amounts_in: Vec<Coin>,
-        share_amount_out: Uint128,
-        no_remaining: bool,
+
+    // Incentive
+    IncentiveBeginRedelegate {
+        delegator_address: String,
+        validator_src_address: String,
+        validator_dst_address: String,
+        amount: Coin,
     },
-    AmmExitPool {
+    IncentiveCancelUnbondingDelegation {
+        delegator_address: String,
+        validator_address: String,
+        amount: Coin,
+        creation_height: i64,
+    },
+
+    // Masterchef
+    MasterchefClaimRewards {
         sender: String,
-        pool_id: u64,
-        min_amounts_out: Vec<Coin>,
-        share_amount_in: Uint128,
-        token_out_denom: String,
+        pool_ids: Vec<u64>,
+    },
+
+    // Estaking
+    EstakingWithdrawElysStakingRewards {
+        delegator_address: String,
     },
 
+    EstakingWithdrawReward {
+        validator_address: String,
+        delegator_address: String,
+    },
+    // Leveragelp
     LeveragelpOpen {
         creator: String,
         collateral_asset: String,
@@ -109,18 +115,21 @@ pub enum ElysMsg {
         lp_amount: Int128,
     },
 
-    EstakingWithdrawElysStakingRewards {
-        delegator_address: String,
-    },
-
-    MasterchefClaimRewards {
-        sender: String,
-        pool_ids: Vec<u64>,
+    // Perpetual
+    PerpetualOpen {
+        creator: String,
+        position: i32,
+        collateral: Coin,
+        trading_asset: String,
+        leverage: SignedDecimal,
+        take_profit_price: SignedDecimal256,
+        owner: String,
     },
-
-    EstakingWithdrawReward {
-        validator_address: String,
-        delegator_address: String,
+    PerpetualClose {
+        creator: String,
+        id: u64,
+        amount: Int128,
+        owner: String,
     },
 }
 
diff --git a/bindings/src/querier.rs b/bindings/src/querier.rs
@@ -311,22 +311,6 @@ impl<'a> ElysQuerier<'a> {
         Ok(resp)
     }
 
-    pub fn get_sub_bucket_rewards_balance(
-        &self,
-        address: String,
-        denom: String,
-        program: i32,
-    ) -> StdResult<BalanceAvailable> {
-        let sub_bucket_reward_query = ElysQuery::CommitmentRewardsSubBucketBalanceOfDenom {
-            address,
-            denom,
-            program,
-        };
-        let request: QueryRequest<ElysQuery> = QueryRequest::Custom(sub_bucket_reward_query);
-        let resp: BalanceAvailable = self.querier.query(&request)?;
-        Ok(resp)
-    }
-
     pub fn get_oracle_price(
         &self,
         asset: String,
diff --git a/bindings/src/query.rs b/bindings/src/query.rs
@@ -32,65 +32,40 @@ pub enum ElysQuery {
     AmmPool { pool_id: u64 },
     #[returns(AmmGetPoolsResponse)]
     AmmPoolAll { pagination: Option<PageRequest> },
-    // Define OracleQuery
-    #[returns(OracleAllPriceResponse)]
-    OraclePriceAll { pagination: PageRequest },
-    #[returns(OracleAssetInfoResponse)]
-    OracleAssetInfo { denom: String },
-    #[returns(QueryGetPriceResponse)]
-    OraclePrice {
-        asset: String,
-        source: String,
-        timestamp: u64,
-    },
-    // Define PerpetualQuery
-    #[returns(PerpetualQueryPositionsResponse)]
-    PerpetualQueryPositions { pagination: PageRequest },
-    #[returns(PerpetualMtpResponse)]
-    PerpetualMtp { address: String, id: u64 },
-    #[returns(PerpetualOpenEstimationResponse)]
-    PerpetualOpenEstimation {
-        position: i32,
-        leverage: SignedDecimal,
-        trading_asset: String,
-        collateral: Coin,
-        take_profit_price: SignedDecimal256,
-        discount: Decimal,
-    },
-    #[returns(PerpetualGetPositionsForAddressResponse)]
-    PerpetualGetPositionsForAddress {
-        address: String,
+    #[returns(Decimal)]
+    AmmPriceByDenom { token_in: Coin, discount: Decimal },
+    #[returns(QueryEarnPoolResponse)]
+    AmmEarnMiningPoolAll {
+        pool_ids: Option<Vec<u64>>,
+        filter_type: i32,
         pagination: Option<PageRequest>,
     },
-    // Define AuthQuery
-    #[returns(AuthAddressesResponse)]
-    AuthAddresses { pagination: Option<PageRequest> },
+    #[returns(QueryJoinPoolEstimationResponse)]
+    AmmJoinPoolEstimation { pool_id: u64, amounts_in: Vec<Coin> },
+    #[returns(QueryExitPoolEstimationResponse)]
+    AmmExitPoolEstimation {
+        pool_id: u64,
+        share_amount_in: Uint128,
+        token_out_denom: String,
+    },
+
+    // Define AssetProfil
     #[returns(QueryGetEntryResponse)]
     AssetProfileEntry { base_denom: String },
     #[returns(QueryGetEntryAllResponse)]
     AssetProfileEntryAll { pagination: Option<PageRequest> },
-    #[returns(QueryAprResponse)]
-    IncentiveApr { withdraw_type: i32, denom: String },
-    #[returns(QueryAprsResponse)]
-    IncentiveAprs {},
-    #[returns(BalanceAvailable)]
-    CommitmentRewardsSubBucketBalanceOfDenom {
-        address: String,
-        denom: String,
-        program: i32,
-    },
+
+    // Define AuthQuery
+    #[returns(AuthAddressesResponse)]
+    AuthAddresses { pagination: Option<PageRequest> },
+
+    // Define Commitment
     #[returns(BalanceAvailable)]
     CommitmentStakedBalanceOfDenom { address: String, denom: String },
-    #[returns(Decimal)]
-    AmmPriceByDenom { token_in: Coin, discount: Decimal },
     #[returns(QueryStakedPositionResponse)]
     CommitmentStakedPositions { delegator_address: String },
     #[returns(QueryUnstakedPositionResponse)]
     CommitmentUnStakedPositions { delegator_address: String },
-    #[returns(BalanceBorrowed)]
-    StableStakeBalanceOfBorrow {},
-    #[returns(StableStakeParamsResp)]
-    StableStakeParams {},
     #[returns(QueryDelegatorDelegationsResponse)]
     CommitmentDelegations { delegator_address: String },
     #[returns(QueryDelegatorUnbondingDelegationsResponse)]
@@ -103,20 +78,28 @@ pub enum ElysQuery {
     CommitmentShowCommitments { creator: String },
     #[returns(QueryVestingInfoResponse)]
     CommitmentVestingInfo { address: String },
-    #[returns(QueryEarnPoolResponse)]
-    AmmEarnMiningPoolAll {
-        pool_ids: Option<Vec<u64>>,
-        filter_type: i32,
-        pagination: Option<PageRequest>,
-    },
-    #[returns(QueryJoinPoolEstimationResponse)]
-    AmmJoinPoolEstimation { pool_id: u64, amounts_in: Vec<Coin> },
-    #[returns(QueryExitPoolEstimationResponse)]
-    AmmExitPoolEstimation {
-        pool_id: u64,
-        share_amount_in: Uint128,
-        token_out_denom: String,
-    },
+    #[returns(CommitmentNumberOfCommitmentsResponse)]
+    CommitmentNumberOfCommitments {},
+
+    // Define Incentive
+    #[returns(QueryAprResponse)]
+    IncentiveApr { withdraw_type: i32, denom: String },
+    #[returns(QueryAprsResponse)]
+    IncentiveAprs {},
+
+    // Define Masterchef
+    #[returns(MasterchefUserPendingRewardResponse)]
+    MasterchefUserPendingReward { user: String },
+    #[returns(QueryPoolAprsResponse)]
+    MasterchefPoolAprs { pool_ids: Vec<u64> },
+    #[returns(QueryStableStakeAprResponse)]
+    MasterchefStableStakeApr { denom: String },
+
+    // Define Estaking
+    #[returns(EstakingRewardsResponse)]
+    EstakingRewards { address: String },
+
+    // Define Leveragelp
     #[returns(LeveragelpParamsResponse)]
     LeveragelpParams {},
     #[returns(LeveragelpPositionsResponse)]
@@ -143,16 +126,44 @@ pub enum ElysQuery {
     LeveragelpPools { pagination: Option<PageRequest> },
     #[returns(LeveragelpPositionResponse)]
     LeveragelpPosition { address: String, id: u64 },
-    #[returns(MasterchefUserPendingRewardResponse)]
-    MasterchefUserPendingReward { user: String },
-    #[returns(EstakingRewardsResponse)]
-    EstakingRewards { address: String },
-    #[returns(QueryPoolAprsResponse)]
-    MasterchefPoolAprs { pool_ids: Vec<u64> },
-    #[returns(QueryStableStakeAprResponse)]
-    MasterchefStableStakeApr { denom: String },
-    #[returns(CommitmentNumberOfCommitmentsResponse)]
-    CommitmentNumberOfCommitments {},
+
+    // Define Perpetual
+    #[returns(PerpetualQueryPositionsResponse)]
+    PerpetualQueryPositions { pagination: PageRequest },
+    #[returns(PerpetualMtpResponse)]
+    PerpetualMtp { address: String, id: u64 },
+    #[returns(PerpetualOpenEstimationResponse)]
+    PerpetualOpenEstimation {
+        position: i32,
+        leverage: SignedDecimal,
+        trading_asset: String,
+        collateral: Coin,
+        take_profit_price: SignedDecimal256,
+        discount: Decimal,
+    },
+    #[returns(PerpetualGetPositionsForAddressResponse)]
+    PerpetualGetPositionsForAddress {
+        address: String,
+        pagination: Option<PageRequest>,
+    },
+
+    // Define Oracle
+    #[returns(OracleAllPriceResponse)]
+    OraclePriceAll { pagination: PageRequest },
+    #[returns(OracleAssetInfoResponse)]
+    OracleAssetInfo { denom: String },
+    #[returns(QueryGetPriceResponse)]
+    OraclePrice {
+        asset: String,
+        source: String,
+        timestamp: u64,
+    },
+
+    // Define Stablestake
+    #[returns(BalanceBorrowed)]
+    StableStakeBalanceOfBorrow {},
+    #[returns(StableStakeParamsResp)]
+    StableStakeParams {},
 }
 
 impl CustomQuery for ElysQuery {}
@@ -247,13 +258,6 @@ impl ElysQuery {
             pagination,
         }
     }
-    pub fn get_sub_bucket_rewards_balance(address: String, denom: String, program: i32) -> Self {
-        ElysQuery::CommitmentRewardsSubBucketBalanceOfDenom {
-            address,
-            denom,
-            program,
-        }
-    }
     pub fn get_oracle_price(asset: String, source: String, timestamp: u64) -> Self {
         ElysQuery::OraclePrice {
             asset,
diff --git a/contracts/account-history-contract/src/entry_point/query.rs b/contracts/account-history-contract/src/entry_point/query.rs
diff --git a/contracts/account-history-contract/src/tests/get_staked_assets.rs b/contracts/account-history-contract/src/tests/get_staked_assets.rs
