make contract code argument positional and throw error when no code s…

…upplied
jstz-dev · Oct 20, 2023 · 11808d7 · 11808d7
1 parent fda534f
commit 11808d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/jstz_cli/src/deploy.rs b/jstz_cli/src/deploy.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use serde_json::json;
 
 use crate::{
@@ -17,7 +17,7 @@ pub fn exec(
     let contract_code = contract_code
         .map(from_file_or_id)
         .or_else(piped_input)
-        .unwrap_or(String::default());
+        .ok_or(anyhow!("No function code supplied"))?;
     // Create JSON message
     let jmsg = json!({
         "DeployContract": {

diff --git a/jstz_cli/src/main.rs b/jstz_cli/src/main.rs
@@ -26,12 +26,12 @@ enum Command {
         /// Address used when deploying the contract
         #[arg(short, long)]
         self_address: String,
-        /// Function code.
-        #[arg(short, long, default_value = None)]
-        function_code: Option<String>,
         /// Initial balance
         #[arg(short, long, default_value_t = 0)]
         balance: u64,
+        /// Function code.
+        #[arg(value_name = "function_code", default_value = None)]
+        function_code: Option<String>,
     },
     /// Run a smart function using a specified URL.
     Run {