cli: make keypair path mandatory and use it as ix authority if multis…

…ig is not specified
mrgnlabs · Apr 17, 2024 · 1fc3305 · 1fc3305
1 parent 17c4828
commit 1fc3305
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/clients/rust/marginfi-cli/src/entrypoint.rs b/clients/rust/marginfi-cli/src/entrypoint.rs
@@ -298,7 +298,7 @@ pub enum ProfileCommand {
         #[clap(long)]
         cluster: Cluster,
         #[clap(long)]
-        keypair_path: Option<String>,
+        keypair_path: String,
         #[clap(long)]
         multisig: Option<Pubkey>,
         #[clap(long)]

diff --git a/clients/rust/marginfi-cli/src/processor/mod.rs b/clients/rust/marginfi-cli/src/processor/mod.rs
@@ -1514,7 +1514,7 @@ pub fn bank_configure(
 pub fn create_profile(
     name: String,
     cluster: Cluster,
-    keypair_path: Option<String>,
+    keypair_path: String,
     multisig: Option<Pubkey>,
     rpc_url: String,
     program_id: Option<Pubkey>,

diff --git a/clients/rust/marginfi-cli/src/profile.rs b/clients/rust/marginfi-cli/src/profile.rs
@@ -19,7 +19,7 @@ use {
 pub struct Profile {
     pub name: String,
     pub cluster: Cluster,
-    pub keypair_path: Option<String>,
+    pub keypair_path: String,
     pub multisig: Option<Pubkey>,
     pub rpc_url: String,
     pub program_id: Option<Pubkey>,
@@ -38,22 +38,14 @@ impl Profile {
     pub fn new(
         name: String,
         cluster: Cluster,
-        keypair_path: Option<String>,
+        keypair_path: String,
         multisig: Option<Pubkey>,
         rpc_url: String,
         program_id: Option<Pubkey>,
         commitment: Option<CommitmentLevel>,
         marginfi_group: Option<Pubkey>,
         marginfi_account: Option<Pubkey>,
     ) -> Self {
-        if keypair_path.is_none() && multisig.is_none() {
-            panic!("Either keypair_path or multisig must be set");
-        }
-
-        if keypair_path.is_some() && multisig.is_some() {
-            panic!("Only one of keypair_path or multisig can be set");
-        }
-
         Profile {
             name,
             cluster,
@@ -68,12 +60,8 @@ impl Profile {
     }
 
     pub fn get_config(&self, global_options: Option<&GlobalOptions>) -> Result<Config> {
-        let fee_payer = if let Some(keypair_path) = self.keypair_path.clone() {
-            read_keypair_file(&*shellexpand::tilde(&keypair_path))
-                .expect("Example requires a keypair file")
-        } else {
-            Keypair::new()
-        };
+        let fee_payer = read_keypair_file(&*shellexpand::tilde(&self.keypair_path))
+                .expect("Example requires a keypair file");
 
         let multisig = self.multisig;
 
@@ -138,22 +126,17 @@ impl Profile {
         group: Option<Pubkey>,
         account: Option<Pubkey>,
     ) -> Result<()> {
-        if keypair_path.is_some() && multisig.is_some() {
-            panic!("Only one of keypair_path or multisig can be set");
-        }
 
         if let Some(cluster) = cluster {
             self.cluster = cluster;
         }
 
         if let Some(keypair_path) = keypair_path {
-            self.keypair_path = Some(keypair_path);
-            self.multisig = None;
+            self.keypair_path = keypair_path;
         }
 
         if let Some(multisig) = multisig {
             self.multisig = Some(multisig);
-            self.keypair_path = None;
         }
 
         if let Some(rpc_url) = rpc_url {
@@ -285,8 +268,7 @@ Profile:
             config.explicit_fee_payer(),
             config.authority(),
             self.keypair_path
-                .clone()
-                .unwrap_or_else(|| "None".to_owned()),
+                .clone(),
             self.multisig
                 .map(|x| x.to_string())
                 .unwrap_or_else(|| "None".to_owned()),