diff --git a/crates/contract/src/core/collateral.rs b/crates/contract/src/core/collateral.rs index 22b8526..c60d5f9 100644 --- a/crates/contract/src/core/collateral.rs +++ b/crates/contract/src/core/collateral.rs @@ -22,7 +22,7 @@ impl LoanPoolMarkerCollateral { marker_address, marker_denom: marker_denom.into(), share_count: Uint128::new(share_count), - removed_permissions: removed_permissions.to_owned(), + removed_permissions, } } } diff --git a/crates/contract/src/execute/settlement/add_loan_pool.rs b/crates/contract/src/execute/settlement/add_loan_pool.rs index 78bbd1b..9bd2089 100644 --- a/crates/contract/src/execute/settlement/add_loan_pool.rs +++ b/crates/contract/src/execute/settlement/add_loan_pool.rs @@ -55,7 +55,7 @@ pub fn handle( .iter() .any(|event| event.ty == "loan_pool_added") { - response = response.add_attribute("added_by", info.sender.clone()); + response = response.add_attribute("added_by", info.sender); } // Set response data to collaterals vector response = response.set_data(to_binary(&LoanPoolMarkers::new(collaterals))?); diff --git a/crates/contract/src/execute/settlement/marker_loan_pool_validation.rs b/crates/contract/src/execute/settlement/marker_loan_pool_validation.rs index b3f43a2..a3f1047 100644 --- a/crates/contract/src/execute/settlement/marker_loan_pool_validation.rs +++ b/crates/contract/src/execute/settlement/marker_loan_pool_validation.rs @@ -1,7 +1,7 @@ use crate::core::error::ContractError; use crate::execute::settlement::extensions::ResultExtensions; use crate::util::provenance_utilities::{ - get_single_marker_coin_holding, marker_has_admin, marker_has_permissions, query_total_supply, + get_single_marker_coin_holding, marker_has_admin, marker_has_permissions, }; use cosmwasm_std::{Addr, Uint128}; use provwasm_std::{Marker, MarkerAccess, MarkerStatus}; diff --git a/crates/contract/src/execute/settlement/withdraw_loan_pool.rs b/crates/contract/src/execute/settlement/withdraw_loan_pool.rs index 32bc0a8..c5c02dd 100644 --- a/crates/contract/src/execute/settlement/withdraw_loan_pool.rs +++ b/crates/contract/src/execute/settlement/withdraw_loan_pool.rs @@ -1,14 +1,8 @@ -use cosmwasm_std::{ - to_binary, Addr, CosmosMsg, DepsMut, Env, Event, MessageInfo, Response, Storage, -}; -use provwasm_std::{ - grant_marker_access, revoke_marker_access, AccessGrant, Marker, MarkerAccess, ProvenanceMsg, - ProvenanceQuerier, ProvenanceQuery, -}; +use cosmwasm_std::{to_binary, Addr, DepsMut, Env, Event, MessageInfo, Response}; +use provwasm_std::{ProvenanceQuerier, ProvenanceQuery}; -use crate::core::collateral::{LoanPoolMarkerCollateral, LoanPoolMarkers, LoanPoolRemovalData}; +use crate::core::collateral::{LoanPoolMarkers, LoanPoolRemovalData}; use crate::core::security::WithdrawLoanPools; -use crate::execute::settlement::extensions::ResultExtensions; use crate::storage::loan_pool_collateral::{get, remove}; use crate::util::provenance_utilities::release_marker_from_contract; use crate::{ @@ -48,8 +42,7 @@ pub fn handle( .map_err(|_| ContractError::InvalidAddress { message: pool.clone(), })?; - let removal_data = - withdraw_marker_pool_collateral(&deps, &info, &env, address.to_owned())?; + let removal_data = withdraw_marker_pool_collateral(&deps, &env, address.to_owned())?; Ok((address, removal_data)) }) .collect::>()?; @@ -89,7 +82,6 @@ pub fn handle( fn withdraw_marker_pool_collateral( deps: &DepsMut, - info: &MessageInfo, env: &Env, marker_address: Addr, ) -> Result { @@ -98,7 +90,7 @@ fn withdraw_marker_pool_collateral( ProvenanceQuerier::new(&deps.querier).get_marker_by_address(marker_address.clone())?; let collateral = get(deps.storage, marker_address.clone())?; let messages = release_marker_from_contract( - &marker.denom, + marker.denom, &env.contract.address, &collateral.removed_permissions, )?; diff --git a/crates/contract/src/storage/loan_pool_collateral.rs b/crates/contract/src/storage/loan_pool_collateral.rs index 16424c5..19cfece 100644 --- a/crates/contract/src/storage/loan_pool_collateral.rs +++ b/crates/contract/src/storage/loan_pool_collateral.rs @@ -43,25 +43,6 @@ pub fn get_with_state( collateral } -#[cfg(feature = "iterator")] -pub fn get_all_collaterals( - store: &dyn Storage, -) -> StdResult> { - let iter = COLLATERAL - .no_prefix_raw() - .range(store, None, None, Order::Ascending); - - let items: Vec<(Addr, LoanPoolMarkerCollateral)> = iter - .map(|item| { - let (addr_bytes, collateral) = item.unwrap(); - let addr = Addr::from(addr_bytes); - (addr, collateral) - }) - .collect(); - - Ok(items) -} - #[cfg(test)] mod tests { use super::*; diff --git a/crates/contract/src/util/provenance_utilities.rs b/crates/contract/src/util/provenance_utilities.rs index fd33591..378cf22 100644 --- a/crates/contract/src/util/provenance_utilities.rs +++ b/crates/contract/src/util/provenance_utilities.rs @@ -1,12 +1,11 @@ use crate::core::error::ContractError; use crate::execute::settlement::extensions::ResultExtensions; use cosmwasm_std::{ - coin, Addr, BankQuery, Coin, CosmosMsg, Deps, DepsMut, Empty, QuerierWrapper, StdResult, - SupplyResponse, Uint128, + coin, Addr, BankQuery, Coin, CosmosMsg, DepsMut, StdResult, SupplyResponse, Uint128, }; use provwasm_std::{ grant_marker_access, revoke_marker_access, AccessGrant, Marker, MarkerAccess, ProvenanceMsg, - ProvenanceMsgParams, ProvenanceQuery, + ProvenanceQuery, }; pub const NHASH: &str = "nhash";