Clippy eliminate warnings & seperate workspace for kairos-deposit-con…

…tract

Cargo.toml

@@ -4,17 +4,12 @@ resolver = "2"
 members = [
   "kairos-cli",
   "kairos-server",
-  "kairos-deposit-contract/contract",
-  "kairos-deposit-contract/malicious-reader",
-  "kairos-deposit-contract/malicious-session",
-  "kairos-deposit-contract/tests",
-  "kairos-deposit-contract/withdrawal-session",
+  "kairos-deposit-contract-tests",
   "kairos-deposit-contract/contract-types",
-  "kairos-deposit-contract/deposit-session",
   "kairos-contract-cli"
 ]
 
 [workspace.package]
 name = "kairos"
 version = "0.1.0"
-edition = "2021"
+edition = "2021"

kairos-contract-cli/src/cli.rs

@@ -1,12 +1,11 @@
 use std::i64;
 
 use crate::deployments::{
-    call_create_purse, call_incr_counter, deploy_handler, get_deposit_event, put_deposit_session,
+    call_create_purse, call_incr_counter, get_counter, get_deposit_event, put_deposit_session,
     put_withdrawal_session,
 };
 use casper_types::{URef, U512};
-use clap::{Command, Parser, Subcommand};
-use kairos_contract_cli::deployments::get_counter;
+use clap::{Parser, Subcommand};
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 #[command(propagate_version = true)]
@@ -15,6 +14,10 @@ struct Cli {
     command: Option<Commands>,
 }
 
+// I want to allow CAPS here,
+// because these enum variants are constant methods.
+#[allow(non_camel_case_types)]
+#[allow(clippy::upper_case_acronyms)]
 #[derive(Subcommand)]
 enum Commands {
     CREATE_PURSE {
@@ -139,7 +142,7 @@ pub async fn commander() {
                 wasm_path,
                 contract_addr,
                 U512::from(*amount),
-                URef::from_formatted_str(&destination).unwrap(),
+                URef::from_formatted_str(destination).unwrap(),
             )
             .await;
             println!("Deploy Hash: {:?}", &withdrawal_hash);
@@ -167,20 +170,19 @@ pub async fn commander() {
             let value = get_counter::get(
                 node_address,
                 rpc_port.to_owned(),
-                URef::from_formatted_str(&counter_uref).unwrap(),
+                URef::from_formatted_str(counter_uref).unwrap(),
             )
             .await;
             println!("Counter value: {:?}", &value);
         }
         None => {
             println!(
+                "
+                Possible commands:
+                
+                create_purse, get_counter, get_deposit, incr_counter, deposit, withdrawal
             "
-                This cli-tool is used in a complex build environment that depends on many branches and is only for development. 
-                \n
-                If you're not sure how to use this tool, then it is currently not for you. Please check back later and follow R&D progress on Kairos L2 development.
-                \n
-                Much love :)
-            ");
+            );
         }
     }
 }

kairos-contract-cli/src/deployments/call_create_purse.rs

@@ -29,17 +29,16 @@ pub async fn call(
     let secret_key_bytes = fs::read(secret_key_path).unwrap();
     let secret_key: SecretKey = SecretKey::from_pem(secret_key_bytes.clone()).unwrap();
     let layer_one_deploy_handler = LayerOneDeployHandler {
-        node_address: node_address,
+        node_address,
         rpc_port: JsonRpcId::String(rpc_port),
         secret_key,
     };
     let mut deploy = layer_one_deploy_handler.build_deploy(
         chain_name,
         raw_deploy,
         &SecretKey::from_pem(secret_key_bytes.clone()).unwrap(),
-        10_000_000_0000u64,
+        100_000_000_000u64,
     );
     deploy.sign(&SecretKey::from_pem(secret_key_bytes).unwrap());
-    let deploy_result = layer_one_deploy_handler.put_deploy(deploy).await;
-    deploy_result
+    layer_one_deploy_handler.put_deploy(deploy).await
 }