fix build

oldGreg5 · oldGreg5 · commit 2efcbc92f216 · 2025-06-17T17:23:08.000+02:00
diff --git a/src/catalyst-toolbox/catalyst-toolbox/src/ideascale/models/de/clean_string.rs b/src/catalyst-toolbox/catalyst-toolbox/src/ideascale/models/de/clean_string.rs
@@ -52,18 +52,18 @@ impl From<String> for CleanString {
     }
 }
 
-impl ToString for CleanString {
-    fn to_string(&self) -> String {
-        self.0.clone()
-    }
-}
-
 impl AsRef<str> for CleanString {
     fn as_ref(&self) -> &str {
         &self.0
     }
 }
 
+impl std::fmt::Display for CleanString {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 static REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("[-*/]").unwrap());
 
 pub fn clean_str(s: &str) -> String {
diff --git a/src/chain-wallet-libs/bindings/wallet-uniffi/src/lib.rs b/src/chain-wallet-libs/bindings/wallet-uniffi/src/lib.rs
@@ -1,3 +1,7 @@
+#![allow(clippy::unneeded_struct_pattern)]
+#![allow(clippy::useless_conversion)]
+#![allow(unused_attributes)]
+
 use chain_crypto::bech32::Bech32;
 use chain_crypto::Ed25519Extended;
 use chain_crypto::SecretKey;
@@ -22,8 +26,6 @@ use wallet_core::Settings as InnerSettings;
 use wallet_core::Wallet as InnerWallet;
 
 // Allow clippy warnings for generated uniffi code
-#[allow(clippy::unneeded_struct_pattern)]
-#[allow(clippy::useless_conversion)]
 include!(concat!(env!("OUT_DIR"), "/lib.uniffi.rs"));
 
 #[derive(Debug, thiserror::Error)]
diff --git a/src/event-db/src/queries/search.rs b/src/event-db/src/queries/search.rs
@@ -48,19 +48,15 @@ impl EventDB {
             where_clause.push_str(
                 format!(
                     "WHERE {0}.{1} LIKE '%{2}%'",
-                    table,
-                    filter.column,
-                    filter.search
+                    table, filter.column, filter.search
                 )
                 .as_str(),
             );
             for filter in filter_iter {
                 where_clause.push_str(
                     format!(
                         "AND {0}.{1} LIKE '%{2}%'",
-                        table,
-                        filter.column,
-                        filter.search
+                        table, filter.column, filter.search
                     )
                     .as_str(),
                 );
@@ -75,24 +71,12 @@ impl EventDB {
         if let Some(order_by) = order_by_iter.next() {
             let order_type = if order_by.descending { "DESC" } else { "ASC" };
             order_by_clause.push_str(
-                format!(
-                    "ORDER BY {0}.{1} {2}",
-                    table,
-                    order_by.column,
-                    order_type
-                )
-                .as_str(),
+                format!("ORDER BY {0}.{1} {2}", table, order_by.column, order_type).as_str(),
             );
             for order_by in order_by_iter {
                 let order_type = if order_by.descending { "DESC" } else { "ASC" };
                 order_by_clause.push_str(
-                format!(
-                        ", {0}.{1} {2}",
-                        table,
-                        order_by.column,
-                        order_type
-                    )
-                    .as_str(),
+                    format!(", {0}.{1} {2}", table, order_by.column, order_type).as_str(),
                 );
             }
         }
diff --git a/src/event-db/src/types/search.rs b/src/event-db/src/types/search.rs
@@ -1,5 +1,5 @@
-use std::fmt::Display;
 use super::{event::EventSummary, objective::ObjectiveSummary, proposal::ProposalSummary};
+use std::fmt::Display;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum SearchTable {
diff --git a/src/jormungandr/testing/jormungandr-automation/src/jormungandr/grpc/server/controller.rs b/src/jormungandr/testing/jormungandr-automation/src/jormungandr/grpc/server/controller.rs
@@ -32,10 +32,7 @@ impl MockController {
         }
     }
 
-    pub fn finish_and_verify_that<F>(
-        self,
-        verify_func: F,
-    ) -> MockExitCode
+    pub fn finish_and_verify_that<F>(self, verify_func: F) -> MockExitCode
     where
         F: 'static + std::marker::Send + Fn(&MockVerifier) -> bool,
     {
diff --git a/src/vit-servicing-station-f10/vit-servicing-station-server-f10/src/main.rs b/src/vit-servicing-station-f10/vit-servicing-station-server-f10/src/main.rs
@@ -17,7 +17,11 @@ fn check_and_build_proper_path(path: &Path) -> std::io::Result<()> {
             format!("Cannot create path tree {}", path.to_str().unwrap()),
         )
     })?)?;
-    fs::OpenOptions::new().create(true).write(true).truncate(true).open(path)?;
+    fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .truncate(true)
+        .open(path)?;
     Ok(())
 }
 
diff --git a/src/vit-servicing-station/vit-servicing-station-server/src/main.rs b/src/vit-servicing-station/vit-servicing-station-server/src/main.rs
@@ -25,7 +25,11 @@ fn check_and_build_proper_path(path: &Path) -> std::io::Result<()> {
             format!("Cannot create path tree {}", path.to_str().unwrap()),
         )
     })?)?;
-    fs::OpenOptions::new().create(true).write(true).truncate(true).open(path)?;
+    fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .truncate(true)
+        .open(path)?;
     Ok(())
 }
 
diff --git a/src/vit-testing/iapyx/src/load/config/servicing_station.rs b/src/vit-testing/iapyx/src/load/config/servicing_station.rs
@@ -19,15 +19,15 @@ pub enum RequestType {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Config {
-    pub config: HashMap<RequestType, Configuration>,
+    pub request_configs: HashMap<RequestType, Configuration>,
     pub criterion: Option<u8>,
     pub address: String,
     pub use_https: bool,
 }
 
 impl Config {
     pub fn get(&self, request_type: RequestType) -> Result<Configuration, Error> {
-        self.config
+        self.request_configs
             .get(&request_type)
             .cloned()
             .ok_or(Error::CannotFindConfigurationFor(request_type))
diff --git a/src/vit-testing/iapyx/src/load/request_generators/jormungandr/post/batch.rs b/src/vit-testing/iapyx/src/load/request_generators/jormungandr/post/batch.rs
@@ -121,15 +121,19 @@ impl BatchWalletRequestGen {
 
         for item in &counter {
             for i in item.range() {
-                match self.proposals.iter().find(|x| {
-                    x.voteplan.chain_voteplan_id == item.id().to_string()
-                        && (x.voteplan.chain_proposal_index % i64::from(u8::MAX)) == i as i64
-                }) {
-                    Some(proposal) => {
-                        println!("vote on: {}/{}", proposal.voteplan.chain_voteplan_id, i);
-                        proposals.push(proposal.clone());
+                match i64::try_from(i) {
+                    Ok(i_i64) => {
+                        if let Some(proposal) = self.proposals.iter().find(|x| {
+                            x.voteplan.chain_voteplan_id == item.id().to_string()
+                                && (x.voteplan.chain_proposal_index % i64::from(u8::MAX)) == i_i64
+                        }) {
+                            println!("vote on: {}/{}", proposal.voteplan.chain_voteplan_id, i);
+                            proposals.push(proposal.clone());
+                        } else {
+                            return Err(MultiControllerError::NotEnoughProposals);
+                        }
                     }
-                    None => {
+                    Err(_) => {
                         return Err(MultiControllerError::NotEnoughProposals);
                     }
                 }
diff --git a/src/vit-testing/iapyx/src/utils/qr.rs b/src/vit-testing/iapyx/src/utils/qr.rs
@@ -146,7 +146,7 @@ pub fn read_qrs<P: AsRef<Path>>(
     let mut secrets = Vec::new();
     for (idx, qr) in qrs.iter().enumerate() {
         println!(
-            "[{}/{}] Decoding {:?}",
+            "[{}/{}] Decoding {}",
             idx + 1,
             qrs.len(),
             qr.as_ref().display()
@@ -156,7 +156,7 @@ pub fn read_qrs<P: AsRef<Path>>(
             Ok(pin) => pin,
             Err(err) => {
                 println!(
-                    "Cannot detect pin from file: {:?}, due to {:?}",
+                    "Cannot detect pin from file: {}, due to {:?}",
                     qr.as_ref().display(),
                     err
                 );
@@ -167,8 +167,8 @@ pub fn read_qrs<P: AsRef<Path>>(
             Ok(img) => img,
             Err(err) => {
                 println!(
-                    "Cannot read qr from file: {:?}, due to {:?}",
-                    qr.as_ref(),
+                    "Cannot read qr from file: {}, due to {:?}",
+                    qr.as_ref().display(),
                     err
                 );
                 continue;
@@ -184,7 +184,7 @@ pub fn read_qrs<P: AsRef<Path>>(
             Ok(secret) => secret,
             Err(err) => {
                 println!(
-                    "Cannot decode qr from file: {:?}, due to {:?}",
+                    "Cannot decode qr from file: {}, due to {:?}",
                     qr.as_ref().display(),
                     err
                 );
diff --git a/src/vit-testing/mainnet-lib/src/wallet/registration.rs b/src/vit-testing/mainnet-lib/src/wallet/registration.rs
@@ -17,19 +17,26 @@ pub static REGISTRATION_METADATA_IDX: LazyLock<u32> = LazyLock::new(|| 61284u32)
 /// registration signature metadata index constant
 pub static REGISTRATION_SIGNATURE_METADATA_IDX: LazyLock<u32> = LazyLock::new(|| 61285u32);
 /// registration metadata constant
-pub static REGISTRATION_METADATA_LABEL: LazyLock<TransactionMetadatumLabel> = LazyLock::new(|| TransactionMetadatumLabel::from(*REGISTRATION_METADATA_IDX));
+pub static REGISTRATION_METADATA_LABEL: LazyLock<TransactionMetadatumLabel> =
+    LazyLock::new(|| TransactionMetadatumLabel::from(*REGISTRATION_METADATA_IDX));
 ///registration signature metadata constant
-pub static REGISTRATION_METADATA_SIGNATURE_LABEL: LazyLock<TransactionMetadatumLabel> = LazyLock::new(|| TransactionMetadatumLabel::from(*REGISTRATION_SIGNATURE_METADATA_IDX));
+pub static REGISTRATION_METADATA_SIGNATURE_LABEL: LazyLock<TransactionMetadatumLabel> =
+    LazyLock::new(|| TransactionMetadatumLabel::from(*REGISTRATION_SIGNATURE_METADATA_IDX));
 /// metadatum label 1 constant
-pub static METADATUM_1: LazyLock<TransactionMetadatum> = LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(1)));
+pub static METADATUM_1: LazyLock<TransactionMetadatum> =
+    LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(1)));
 /// metadatum label 2 constant
-pub static METADATUM_2: LazyLock<TransactionMetadatum> = LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(2)));
+pub static METADATUM_2: LazyLock<TransactionMetadatum> =
+    LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(2)));
 /// metadatum label 3 constant
-pub static METADATUM_3: LazyLock<TransactionMetadatum> = LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(3)));
+pub static METADATUM_3: LazyLock<TransactionMetadatum> =
+    LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(3)));
 /// metadatum label 4 constant
-pub static METADATUM_4: LazyLock<TransactionMetadatum> = LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(4)));
+pub static METADATUM_4: LazyLock<TransactionMetadatum> =
+    LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(4)));
 /// metadatum label 5 constant
-pub static METADATUM_5: LazyLock<TransactionMetadatum> = LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(5)));
+pub static METADATUM_5: LazyLock<TransactionMetadatum> =
+    LazyLock::new(|| TransactionMetadatum::new_int(&Int::new_i32(5)));
 
 /// Responsible for building registration transaction metadata
 pub struct RegistrationTransactionBuilder<'a> {
diff --git a/src/vit-testing/mainnet-tools/src/snapshot/wormhole/command.rs b/src/vit-testing/mainnet-tools/src/snapshot/wormhole/command.rs
@@ -57,6 +57,10 @@ impl Command {
     /// # Errors
     ///
     /// On IO related errors
+    ///
+    /// # Panics
+    ///
+    /// Panics if the log level string is invalid.
     pub fn exec(self) -> Result<()> {
         let subscriber = FmtSubscriber::builder()
             .with_file(false)

Original file line number	Diff line number	Diff line change
`@@ -52,18 +52,18 @@ impl From<String> for CleanString {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`-impl ToString for CleanString {`
`56`		`- fn to_string(&self) -> String {`
`57`		`- self.0.clone()`
`58`		`- }`
`59`		`-}`
`60`		`-`
`61`	`55`	`impl AsRef<str> for CleanString {`
`62`	`56`	`fn as_ref(&self) -> &str {`
`63`	`57`	`&self.0`
`64`	`58`	`}`
`65`	`59`	`}`
`66`	`60`
	`61`	`+impl std::fmt::Display for CleanString {`
	`62`	`+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
	`63`	`+ write!(f, "{}", self.0)`
	`64`	`+ }`
	`65`	`+}`
	`66`	`+`
`67`	`67`	`static REGEX: Lazy<Regex> = Lazy::new(\|\| Regex::new("[-*/]").unwrap());`
`68`	`68`
`69`	`69`	`pub fn clean_str(s: &str) -> String {`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,7 @@ impl MockController {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- pub fn finish_and_verify_that<F>(`
`36`		`- self,`
`37`		`- verify_func: F,`
`38`		`- ) -> MockExitCode`
	`35`	`+ pub fn finish_and_verify_that<F>(self, verify_func: F) -> MockExitCode`
`39`	`36`	`where`
`40`	`37`	`F: 'static + std::marker::Send + Fn(&MockVerifier) -> bool,`
`41`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@ fn check_and_build_proper_path(path: &Path) -> std::io::Result<()> {`
`17`	`17`	`format!("Cannot create path tree {}", path.to_str().unwrap()),`
`18`	`18`	`)`
`19`	`19`	`})?)?;`
`20`		`- fs::OpenOptions::new().create(true).write(true).truncate(true).open(path)?;`
	`20`	`+ fs::OpenOptions::new()`
	`21`	`+ .create(true)`
	`22`	`+ .write(true)`
	`23`	`+ .truncate(true)`
	`24`	`+ .open(path)?;`
`21`	`25`	`Ok(())`
`22`	`26`	`}`
`23`	`27`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,11 @@ fn check_and_build_proper_path(path: &Path) -> std::io::Result<()> {`
`25`	`25`	`format!("Cannot create path tree {}", path.to_str().unwrap()),`
`26`	`26`	`)`
`27`	`27`	`})?)?;`
`28`		`- fs::OpenOptions::new().create(true).write(true).truncate(true).open(path)?;`
	`28`	`+ fs::OpenOptions::new()`
	`29`	`+ .create(true)`
	`30`	`+ .write(true)`
	`31`	`+ .truncate(true)`
	`32`	`+ .open(path)?;`
`29`	`33`	`Ok(())`
`30`	`34`	`}`
`31`	`35`