add verification for missing flags

onflow · Oct 24, 2023 · 60cbcd6 · 60cbcd6
1 parent daa1550
commit 60cbcd6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/flowkit/gateway/mocks/Gateway.go b/flowkit/gateway/mocks/Gateway.go
diff --git a/flowkit/mocks/Services.go b/flowkit/mocks/Services.go
diff --git a/internal/transactions/send.go b/internal/transactions/send.go
@@ -95,8 +95,14 @@ func send(
 
 	signerName := sendFlags.Signer
 
-	if signerName == "" && proposer == nil && payer == nil && len(authorizers) == 0 {
-		signerName = state.Config().Emulators.Default().ServiceAccount
+	if signerName == "" {
+		if proposer == nil && payer == nil && len(authorizers) == 0 {
+			signerName = state.Config().Emulators.Default().ServiceAccount
+		} else {
+			if proposer == nil || payer == nil {
+				return nil, fmt.Errorf("proposer/payer flags are required when signer flag is not used")
+			}
+		}
 	}
 
 	if signerName != "" {

diff --git a/internal/transactions/transactions_test.go b/internal/transactions/transactions_test.go
@@ -189,7 +189,24 @@ func Test_Send(t *testing.T) {
 		sendFlags.Signer = "" // reset
 	})
 
+	t.Run("Fail signer not used and payer and proposer flags not set", func(t *testing.T) {
+		sendFlags.Payer = ""
+		sendFlags.Proposer = config.DefaultEmulator.ServiceAccount
+		_, err := send([]string{""}, command.GlobalFlags{}, util.NoLogger, srv.Mock, state)
+		assert.EqualError(t, err, "proposer/payer flags are required when signer flag is not used")
+		sendFlags.Signer = "" // reset
+
+		sendFlags.Proposer = ""
+		sendFlags.Payer = config.DefaultEmulator.ServiceAccount
+		_, err = send([]string{""}, command.GlobalFlags{}, util.NoLogger, srv.Mock, state)
+		assert.EqualError(t, err, "proposer/payer flags are required when signer flag is not used")
+		sendFlags.Signer = "" // reset
+
+	})
+
 	t.Run("Fail loading transaction file", func(t *testing.T) {
+		sendFlags.Proposer = config.DefaultEmulator.ServiceAccount
+		sendFlags.Payer = config.DefaultEmulator.ServiceAccount
 		_, err := send([]string{"invalid"}, command.GlobalFlags{}, util.NoLogger, srv.Mock, state)
 		assert.EqualError(t, err, "error loading transaction file: open invalid: file does not exist")
 	})