Improve setting of VRK multisigs

2021-03-17 00:18:50 -04:00
parent 3c81576bfa
commit 80ff0b0564
1 changed files with 8 additions and 10 deletions
@@ -334,11 +334,6 @@ var genesisSetVRKCmd = &cli.Command{
 			return err
 		}

-		csvf, err := homedir.Expand(cctx.Args().Get(1))
-		if err != nil {
-			return err
-		}
-
 		var template genesis.Template
 		b, err := ioutil.ReadFile(genf)
 		if err != nil {
@@ -363,6 +358,10 @@ var genesisSetVRKCmd = &cli.Command{
 				Meta:    am.ActorMeta(),
 			}
 		} else if cctx.IsSet("multisig") {
+			csvf, err := homedir.Expand(cctx.String("multisig"))
+			if err != nil {
+				return err
+			}

 			entries, err := parseMultisigCsv(csvf)
 			if err != nil {
@@ -431,11 +430,6 @@ var genesisSetRemainderCmd = &cli.Command{
 			return err
 		}

-		csvf, err := homedir.Expand(cctx.Args().Get(1))
-		if err != nil {
-			return err
-		}
-
 		var template genesis.Template
 		b, err := ioutil.ReadFile(genf)
 		if err != nil {
@@ -460,6 +454,10 @@ var genesisSetRemainderCmd = &cli.Command{
 				Meta:    am.ActorMeta(),
 			}
 		} else if cctx.IsSet("multisig") {
+			csvf, err := homedir.Expand(cctx.String("multisig"))
+			if err != nil {
+				return err
+			}

 			entries, err := parseMultisigCsv(csvf)
 			if err != nil {