chore: fix clippy. switch to package for dust-collector

contracts/hub-tf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pfc-steak-hub-tf"
-version = "3.0.9"
+version = "3.0.10"
 authors = ["larry <[email protected]>", "PFC <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
@@ -26,9 +26,9 @@ prost = {version = "0.11.0", default-features = false, features = ["prost-derive
 prost-types = {version = "0.11.1", default-features = false}
 schemars = "0.8.11"
 pfc-steak = { path = "../../packages/steak" }
-pfc-dust-collector = { path = "../../packages/dust_collector" }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-pfc-fee-split = "0.2.3"
+pfc-fee-split = "0.2.5"
+pfc-dust-collector="0.1.0"
 #kujira = "0.7.25"
 osmosis-std-derive="0.13.2"
 protobuf = { version = "3.1.0", features = ["with-bytes"] }

contracts/hub-tf/src/contract.rs

@@ -97,7 +97,7 @@ pub fn execute(deps: DepsMut, env: Env, info: MessageInfo, msg: ExecuteMsg) -> S
         ExecuteMsg::SetUnbondPeriod { unbond_period } => execute::set_unbond_period(deps, env, info.sender, unbond_period),
 
         ExecuteMsg::SetDustCollector { dust_collector } => { execute::set_dust_collector(deps, env, info.sender, dust_collector) }
-        ExecuteMsg::CollectDust {} => { execute::collect_dust(deps, env) }
+        ExecuteMsg::CollectDust { max_tokens } => { execute::collect_dust(deps, env, max_tokens) }
         ExecuteMsg::ReturnDenom {} => { execute::return_denom(deps, env, info.funds) }
     }
 }
@@ -124,7 +124,7 @@ fn callback(
 pub fn reply(deps: DepsMut, env: Env, reply: Reply) -> StdResult<Response> {
     match reply.id {
         REPLY_REGISTER_RECEIVED_COINS => {
-            execute::collect_dust(deps, env)
+            execute::collect_dust(deps, env,10)
         }
         _ => {
             Err(StdError::generic_err(format!(

contracts/hub-tf/src/execute.rs

@@ -1070,7 +1070,7 @@ pub fn set_dust_collector(
         .add_attribute("action", "steakhub/set_dust_collector"))
 }
 
-pub fn collect_dust(deps: DepsMut, _env: Env) -> StdResult<Response> {
+pub fn collect_dust(deps: DepsMut, _env: Env, max_tokens: u64) -> StdResult<Response> {
     let state = State::default();
 
     if let Some(_dust_addr) = state.dust_collector.load(deps.storage)? {

contracts/hub-tf/src/queries.rs

@@ -31,8 +31,8 @@ pub fn config(deps: Deps) -> StdResult<ConfigResponse> {
     }
 
 
-    let validator_active_vec: Vec<String> = Vec::from_iter(validators_active.into_iter());
-    let paused_validators: Vec<String> = Vec::from_iter(validators.into_iter());
+    let validator_active_vec: Vec<String> = Vec::from_iter(validators_active);
+    let paused_validators: Vec<String> = Vec::from_iter(validators);
 
     Ok(ConfigResponse {
         owner: state.owner.load(deps.storage)?.into(),
@@ -68,7 +68,7 @@ pub fn state(deps: Deps, env: Env) -> StdResult<StateResponse> {
         validators_active.insert(res?);
     }
     validators.extend(validators_active);
-    let validator_vec: Vec<String> = Vec::from_iter(validators.into_iter());
+    let validator_vec: Vec<String> = Vec::from_iter(validators);
     let delegations = query_delegations(&deps.querier, &validator_vec, &env.contract.address, &denom)?;
     let total_native: u128 = delegations.iter().map(|d| d.amount).sum();
 

contracts/hub/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pfc-steak-hub"
-version = "3.0.8"
+version = "3.0.10"
 authors = ["larry <[email protected]>", "PFC <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
@@ -21,7 +21,7 @@ cw-storage-plus = "0.13"
 pfc-steak = { path = "../../packages/steak" }
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 pfc-fee-split = "0.2.3"
-pfc-dust-collector = { path = "../../packages/dust_collector" }
+pfc-dust-collector = "0.1.0"
 funds-distributor-api = {git="https://github.com/terra-money/enterprise-contracts.git" , branch="main"}
 #[dev-dependencies]
 #serde = { version = "1.0.103", default-features = false, features = ["derive"] }

contracts/hub/src/queries.rs

@@ -23,8 +23,8 @@ pub fn config(deps: Deps) -> StdResult<ConfigResponse> {
     for v in validators_active.iter() {
         validators.remove(v);
     }
-    let validator_active_vec: Vec<String> = Vec::from_iter(validators_active.into_iter());
-    let paused_validators: Vec<String> = Vec::from_iter(validators.into_iter());
+    let validator_active_vec: Vec<String> = Vec::from_iter(validators_active);
+    let paused_validators: Vec<String> = Vec::from_iter(validators);
 
     Ok(ConfigResponse {
         owner: state.owner.load(deps.storage)?.into(),
@@ -57,7 +57,7 @@ pub fn state(deps: Deps, env: Env) -> StdResult<StateResponse> {
     let mut validators: HashSet<String> = HashSet::from_iter(state.validators.load(deps.storage)?);
     let validators_active: HashSet<String> = HashSet::from_iter(state.validators_active.load(deps.storage)?);
     validators.extend(validators_active);
-    let validator_vec: Vec<String> = Vec::from_iter(validators.into_iter());
+    let validator_vec: Vec<String> = Vec::from_iter(validators);
 
     let delegations = query_delegations(&deps.querier, &validator_vec, &env.contract.address, &denom)?;
     let total_native: u128 = delegations.iter().map(|d| d.amount).sum();

packages/steak/src/hub_tf.rs

@@ -112,7 +112,7 @@ pub enum ExecuteMsg {
     /// Set Dust Collector Contract
     SetDustCollector { dust_collector: Option<String> },
     /// Collect the Dust
-    CollectDust {},
+    CollectDust { max_tokens: u64},
     /// Return the Dust in shiny 'base denom'
     ReturnDenom {},
 }