Prompts unit tests (#2841)

* more prompter to its own file. remove test for standard slices.Contains.

* unify some names

* refining the tests

* a bit more coverage

* almost full coverage on prompts.go

* start adding validations tests

* reorganize code so coverage for prompts.go tests are included

* more tests

* coverage of validations much improved

* comparator test

* nice

* even more coverage

* more ov

* nit

* split tests among two files

* almost there

* 99.4 coverage on prompts

* address codeQL report

Author: felipemadero

cmd/blockchaincmd/deploy.go

@@ -26,6 +26,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/prompts"
+	"github.com/ava-labs/avalanche-cli/pkg/prompts/comparator"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/txutils"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
@@ -334,15 +335,15 @@ func getSubnetEVMMainnetChainID(sc *models.Sidecar, blockchainName string) error
 			ux.Logger.PrintToUser("Enter your blockchain's ChainID. It can be any positive integer != %d.", originalChainID)
 			newChainID, err := app.Prompt.CapturePositiveInt(
 				"ChainID",
-				[]prompts.Comparator{
+				[]comparator.Comparator{
 					{
 						Label: "Zero",
-						Type:  prompts.MoreThan,
+						Type:  comparator.MoreThan,
 						Value: 0,
 					},
 					{
 						Label: "Original Chain ID",
-						Type:  prompts.NotEq,
+						Type:  comparator.NotEq,
 						Value: originalChainID,
 					},
 				},

cmd/blockchaincmd/publish_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/config"
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	"github.com/ava-labs/avalanche-cli/pkg/models"
+	promptsmocks "github.com/ava-labs/avalanche-cli/pkg/prompts/mocks"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/ids"
@@ -393,7 +394,7 @@ func TestPublishing(t *testing.T) {
 	mockPrompt.ExpectedCalls = nil
 }
 
-func configureMockPrompt(mockPrompt *mocks.Prompter) {
+func configureMockPrompt(mockPrompt *promptsmocks.Prompter) {
 	mockPrompt.On("CaptureList", mock.Anything, mock.Anything).Return("Add", nil).Once()
 	mockPrompt.On("CaptureEmail", mock.Anything).Return("someone@somewhere.com", nil)
 	mockPrompt.On("CaptureList", mock.Anything, mock.Anything).Return("Done", nil).Once()
@@ -407,14 +408,14 @@ func configureMockPrompt(mockPrompt *mocks.Prompter) {
 	mockPrompt.On("CaptureVersion", mock.Anything).Return("v0.9.99", nil)
 }
 
-func setupTestEnv(t *testing.T) (*require.Assertions, *mocks.Prompter) {
+func setupTestEnv(t *testing.T) (*require.Assertions, *promptsmocks.Prompter) {
 	require := require.New(t)
 	testDir := t.TempDir()
 	err := os.Mkdir(filepath.Join(testDir, "repos"), 0o755)
 	require.NoError(err)
 	ux.NewUserLog(logging.NoLog{}, io.Discard)
 	app = &application.Avalanche{}
-	mockPrompt := mocks.NewPrompter(t)
+	mockPrompt := promptsmocks.NewPrompter(t)
 	app.Setup(testDir, logging.NoLog{}, config.New(), "", mockPrompt, application.NewDownloader(), nil)
 
 	return require, mockPrompt

cmd/blockchaincmd/upgradecmd/generate.go

@@ -5,6 +5,7 @@ package upgradecmd
 import (
 	"encoding/json"
 	"fmt"
+	"math"
 	"os"
 	"time"
 
@@ -26,7 +27,7 @@ import (
 	"github.com/ava-labs/subnet-evm/precompile/contracts/txallowlist"
 	subnetevmutils "github.com/ava-labs/subnet-evm/utils"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/math"
+	goethereummath "github.com/ethereum/go-ethereum/common/math"
 	"github.com/spf13/cobra"
 )
 
@@ -249,7 +250,7 @@ func promptNativeMintParams(
 	precompiles *[]params.PrecompileUpgrade,
 	date time.Time,
 ) (bool, error) {
-	initialMint := map[common.Address]*math.HexOrDecimal256{}
+	initialMint := map[common.Address]*goethereummath.HexOrDecimal256{}
 	adminAddrs, managerAddrs, enabledAddrs, cancelled, err := promptAdminManagerAndEnabledAddresses(sc, "mint native tokens")
 	if cancelled || err != nil {
 		return cancelled, err
@@ -271,7 +272,11 @@ func promptNativeMintParams(
 				if err != nil {
 					return "", err
 				}
-				initialMint[addr] = math.NewHexOrDecimal256(int64(amount))
+				// Check for overflow when converting uint64 to int64
+				if amount > math.MaxInt64 {
+					return "", fmt.Errorf("amount %d exceeds maximum allowed value of %d", amount, math.MaxInt64)
+				}
+				initialMint[addr] = goethereummath.NewHexOrDecimal256(int64(amount))
 				return fmt.Sprintf("%s-%d", addr.Hex(), amount), nil
 			},
 			"Add an address to amount pair",

cmd/flags/blockchain_test.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ava-labs/avalanche-cli/internal/mocks"
 	"github.com/ava-labs/avalanche-cli/pkg/application"
+	"github.com/ava-labs/avalanche-cli/pkg/prompts/mocks"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 )

cmd/nodecmd/local.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/node"
 	"github.com/ava-labs/avalanche-cli/pkg/prompts"
+	"github.com/ava-labs/avalanche-cli/pkg/prompts/comparator"
 	"github.com/ava-labs/avalanche-cli/pkg/signatureaggregator"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/utils"
@@ -436,10 +437,10 @@ func localValidate(_ *cobra.Command, args []string) error {
 	if stakeAmount == 0 {
 		stakeAmount, err = app.Prompt.CaptureUint64Compare(
 			"Enter the amount of token to stake for each validator",
-			[]prompts.Comparator{
+			[]comparator.Comparator{
 				{
 					Label: "Positive",
-					Type:  prompts.MoreThan,
+					Type:  comparator.MoreThan,
 					Value: 0,
 				},
 			},

cmd/primarycmd/add_validator.go

@@ -18,6 +18,7 @@ import (
 	"github.com/ava-labs/avalanche-cli/pkg/models"
 	"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
 	"github.com/ava-labs/avalanche-cli/pkg/prompts"
+	"github.com/ava-labs/avalanche-cli/pkg/prompts/comparator"
 	"github.com/ava-labs/avalanche-cli/pkg/subnet"
 	"github.com/ava-labs/avalanche-cli/pkg/ux"
 	"github.com/ava-labs/avalanchego/ids"
@@ -233,10 +234,10 @@ func getDelegationFeeOption(app *application.Avalanche, network models.Network)
 		ux.Logger.PrintToUser("Note that 20 000 is equivalent to 2%%")
 		delegationFee, err := app.Prompt.CapturePositiveInt(
 			delegationFeePrompt,
-			[]prompts.Comparator{
+			[]comparator.Comparator{
 				{
 					Label: "Min Delegation Fee",
-					Type:  prompts.MoreThanEq,
+					Type:  comparator.MoreThanEq,
 					Value: uint64(defaultFee),
 				},
 			},