fix build

Author: oldGreg5

.github/workflows/rust.yml

@@ -390,7 +390,7 @@ jobs:
         uses: actions-rs/[email protected]
         with:
           crate: uniffi_bindgen
-          version: 0.21.1
+          version: 0.29.3
           use-tool-cache: true
 
       - name: Clippy and fmt

src/chain-wallet-libs/bindings/wallet-c/src/lib.rs

@@ -49,9 +49,9 @@ pub type EncryptingVoteKeyPtr = *mut EncryptingVoteKey;
 /// # parameters
 ///
 /// * account_key: the Ed25519 extended key used wallet's account address private key
-///  in the form of a 64 bytes array.
+///   in the form of a 64 bytes array.
 /// * utxo_keys: an array of Ed25519 extended keys in the form of 64 bytes, used as utxo
-///  keys for the wallet
+///   keys for the wallet
 /// * utxo_keys_len: the number of keys in the utxo_keys array (not the number of bytes)
 /// * wallet_out: the recovered wallet
 ///

src/chain-wallet-libs/bindings/wallet-core/src/c/mod.rs

@@ -41,9 +41,9 @@ pub const NONCES_SIZE: usize = 8 * 4;
 /// # parameters
 ///
 /// * account_key: the Ed25519 extended key used wallet's account address private key
-/// in the form of a 64 bytes array.
+///   in the form of a 64 bytes array.
 /// * utxo_keys: an array of Ed25519 keys in the form of 64 bytes, used as utxo
-/// keys for the wallet
+///   keys for the wallet
 /// * utxo_keys_len: the number of keys in the utxo_keys array (not the number of bytes)
 /// * wallet_out: the recovered wallet
 ///

src/chain-wallet-libs/wallet/src/states.rs

@@ -62,10 +62,10 @@ where
 
     /// check wether the given state associate to this key is present
     /// in the States
-    pub fn contains<Q: ?Sized>(&self, key: &Q) -> bool
+    pub fn contains<Q>(&self, key: &Q) -> bool
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
+        Q: ?Sized + Hash + Eq,
     {
         self.states.contains_key(key)
     }
@@ -77,10 +77,10 @@ where
         assert!(self.states.insert(key, state).is_none());
     }
 
-    pub fn confirm<Q: ?Sized>(&mut self, key: &Q)
+    pub fn confirm<Q>(&mut self, key: &Q)
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
+        Q: ?Sized + Hash + Eq,
     {
         if let Some(state) = self.states.get_mut(key) {
             state.confirm();

src/event-db/src/lib.rs

@@ -37,7 +37,7 @@ pub struct EventDB {
 /// * `url` set to the postgres connection string needed to connect to the
 ///   database.  IF it is None, then the env var "`DATABASE_URL`" will be used
 ///   for this connection string. eg:
-/// "`postgres://catalyst-dev:CHANGE_ME@localhost/CatalystDev`"
+///   "`postgres://catalyst-dev:CHANGE_ME@localhost/CatalystDev`"
 ///
 /// # Errors
 ///

src/event-db/src/queries/search.rs

@@ -49,7 +49,7 @@ impl EventDB {
                 format!(
                     "WHERE {0}.{1} LIKE '%{2}%'",
                     table,
-                    filter.column.to_string(),
+                    filter.column,
                     filter.search
                 )
                 .as_str(),
@@ -59,7 +59,7 @@ impl EventDB {
                     format!(
                         "AND {0}.{1} LIKE '%{2}%'",
                         table,
-                        filter.column.to_string(),
+                        filter.column,
                         filter.search
                     )
                     .as_str(),
@@ -78,18 +78,18 @@ impl EventDB {
                 format!(
                     "ORDER BY {0}.{1} {2}",
                     table,
-                    order_by.column.to_string(),
+                    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} LIKE '%{2}%'",
+                format!(
+                        ", {0}.{1} {2}",
                         table,
-                        order_by.column.to_string(),
+                        order_by.column,
                         order_type
                     )
                     .as_str(),

src/event-db/src/types/search.rs

@@ -1,3 +1,4 @@
+use std::fmt::Display;
 use super::{event::EventSummary, objective::ObjectiveSummary, proposal::ProposalSummary};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -16,15 +17,16 @@ pub enum SearchColumn {
     Funds,
 }
 
-impl ToString for SearchColumn {
-    fn to_string(&self) -> String {
-        match self {
+impl Display for SearchColumn {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
             SearchColumn::Title => "title".to_string(),
             SearchColumn::Type => "type".to_string(),
             SearchColumn::Description => "description".to_string(),
             SearchColumn::Author => "author".to_string(),
             SearchColumn::Funds => "funds".to_string(),
-        }
+        };
+        write!(f, "{}", str)
     }
 }
 

src/jormungandr/jormungandr/src/blockchain/process.rs

@@ -61,10 +61,10 @@ pub struct TaskData {
 /// The blockchain process is comprised mainly of two parts:
 ///
 /// * Bookkeeping of all blocks known to the node:
-/// This is the most resource heavy operation but can be parallelized depending on the chain structure.
+///   This is the most resource heavy operation but can be parallelized depending on the chain structure.
 /// * Tip selection and update:
-/// Tip updates must be serialized to avoid inconsistent states but are very light on resources.
-/// No performance penalty should come from this synchronization point.
+///   Tip updates must be serialized to avoid inconsistent states but are very light on resources.
+///   No performance penalty should come from this synchronization point.
 struct Process {
     blockchain: Blockchain,
     blockchain_tip: Tip,

src/jormungandr/testing/jormungandr-automation/src/jormungandr/grpc/server/controller.rs

@@ -32,12 +32,12 @@ impl MockController {
         }
     }
 
-    pub fn finish_and_verify_that<F: 'static + std::marker::Send>(
+    pub fn finish_and_verify_that<F>(
         self,
         verify_func: F,
     ) -> MockExitCode
     where
-        F: Fn(&MockVerifier) -> bool,
+        F: 'static + std::marker::Send + Fn(&MockVerifier) -> bool,
     {
         let start = Instant::now();
         let timeout = Duration::from_secs(120);

src/jormungandr/testing/jormungandr-automation/src/testing/benchmark/sync/report.rs

@@ -30,18 +30,18 @@ impl MeasurementReporter {
         self.counter >= self.interval
     }
 
-    pub fn do_if_interval_reached<F: std::marker::Send>(&self, method: F)
+    pub fn do_if_interval_reached<F>(&self, method: F)
     where
-        F: Fn(),
+        F: std::marker::Send + Fn(),
     {
         if self.is_interval_reached() {
             method();
         }
     }
 
-    pub fn do_if_interval_reached_and_inc<F: std::marker::Send>(&mut self, method: F)
+    pub fn do_if_interval_reached_and_inc<F>(&mut self, method: F)
     where
-        F: Fn(),
+        F: std::marker::Send + Fn(),
     {
         if self.is_interval_reached() {
             method();