ci fixes

.cargo/config.toml

@@ -3,3 +3,13 @@ linker = "aarch64-linux-gnu-gcc"
 
 [target.riscv64gc-unknown-linux-gnu]
 linker = "riscv64-linux-gnu-gcc"
+
+
+[alias]
+ci-fmt = "fmt --all -- --check"
+ci-fmt-fix = "fmt --all"
+ci-clippy = "lints clippy --all-targets --all-features"
+ci-test-compile = "test --no-run --workspace --all-features --no-default-features"
+ci-test = "nextest run --all-features --release --workspace --exclude integration_tests --profile ci"
+ci-cucumber = "test --all-features --release --package integration_tests"
+#ci-check = "check --workspace --release --all-features --all-targets --lock

applications/minotari_console_wallet/Cargo.toml

@@ -17,7 +17,6 @@ tari_crypto = { version = "0.20" }
 tari_key_manager = { path = "../../base_layer/key_manager" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
-tari_script = { path = "../../infrastructure/tari_script" }
 tari_shutdown = { path = "../../infrastructure/shutdown" }
 tari_utilities = { version = "0.7" }
 minotari_wallet = { path = "../../base_layer/wallet", features = [

applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs

@@ -983,13 +983,13 @@ impl wallet_server::Wallet for WalletGrpcServer {
                     .map_err(|_| Status::invalid_argument("binary sha is malformed"))?,
                 message.binary_url,
                 fee_per_gram,
-                if !message.sidechain_deployment_key.is_empty() {
+                if message.sidechain_deployment_key.is_empty() {
+                    None
+                } else {
                     Some(
                         RistrettoSecretKey::from_canonical_bytes(&message.sidechain_deployment_key)
                             .map_err(|_| Status::invalid_argument("sidechain_deployment_key is malformed"))?,
                     )
-                } else {
-                    None
                 },
             )
             .await

applications/minotari_node/src/grpc/base_node_grpc_server.rs

@@ -1803,13 +1803,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
         let mut handler = self.node_service.clone();
         let (mut tx, rx) = mpsc::channel(1000);
 
-        let sidechain_id = if !request.sidechain_id.is_empty() {
+        let sidechain_id = if request.sidechain_id.is_empty() {
+            None
+        } else {
             Some(
                 PublicKey::from_canonical_bytes(&request.sidechain_id)
                     .map_err(|e| Status::invalid_argument(format!("Invalid sidechain_id '{}'", e)))?,
             )
-        } else {
-            None
         };
 
         task::spawn(async move {