rebase and fix remarks

hadronlabs-org · Dec 11, 2023 · 1e3884a · 1e3884a
1 parent 288988c
commit 1e3884a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,11 +17,12 @@ prost                            = "0.12.1"
 prost-types                      = "0.12.1"
 protobuf                         = "3.2.0"
 tendermint-proto                 = "0.34.0"
-cosmwasm-schema                  = { version = "1.3.1" }
-cosmwasm-std                     = { version = "1.2.1" }
-cw-storage-plus                  = { version = "1.0.1" }
-cw2                              = { version = "1.0.1" }
+cosmwasm-std                     = { version = "1.5.0", default-features = false }
+cosmwasm-schema                  = { version = "1.5.0", default-features = false }
+cw-storage-plus                  = { version = "1.2.0", default-features = false }
+cw2                              = { version = "1.1.2", default-features = false }
 cw20                             = { version = "1.0.1" }
+cw-utils                         = { version = "1.0.3", default-features = false }
 schemars                         = "0.8"
 serde                            = { version = "1.0.127", default-features = false, features = ["derive"] }
 serde-json-wasm                  = { version = "1.0.0" }
@@ -42,12 +43,3 @@ panic = 'abort'
 incremental = false
 overflow-checks = true
 
-[workspace.dependencies]
-cosmwasm-std    = { version = "1.5.0", default-features = false }
-cosmwasm-schema = { version = "1.5.0", default-features = false }
-cw-storage-plus = { version = "1.2.0", default-features = false }
-cw2             = { version = "1.1.2", default-features = false }
-cw-utils        = { version = "1.0.3", default-features = false }
-neutron-sdk     = { git = "https://github.com/neutron-org/neutron-sdk", branch = "sdk/47", default-features = false }
-cw-ownable      = "0.5.1"
-thiserror       = "1.0.50"
diff --git a/contracts/validators-stats/src/contract.rs b/contracts/validators-stats/src/contract.rs
@@ -152,9 +152,9 @@ pub fn sudo_kv_query_result(
     let interchain_query_result = get_raw_interchain_query_result(deps.as_ref(), query_id)?;
 
     if optional_query_id == validator_profile_query_id {
-        return validator_info_sudo(deps, _env, interchain_query_result);
+        return sudo_validator_info(deps, _env, interchain_query_result);
     } else if optional_query_id == signing_info_query_id {
-        return signing_info_sudo(deps, _env, interchain_query_result);
+        return sudo_signing_info(deps, _env, interchain_query_result);
     } else {
         deps.api.debug(&format!(
             "WASMDEBUG: sudo_kv_query_result query_id: {:?}",
@@ -165,7 +165,7 @@ pub fn sudo_kv_query_result(
     Ok(Response::default())
 }
 
-fn validator_info_sudo(
+fn sudo_validator_info(
     deps: DepsMut<NeutronQuery>,
     env: Env,
     interchain_query_result: QueryRegisteredQueryResultResponse,
@@ -229,7 +229,7 @@ fn commission_in_range(rate: Decimal, min: Decimal, max: Decimal) -> bool {
     rate >= min && rate <= max
 }
 
-fn signing_info_sudo(
+fn sudo_signing_info(
     deps: DepsMut<NeutronQuery>,
     env: Env,
     interchain_query_result: QueryRegisteredQueryResultResponse,