make IsValidAddr private and extend regex to account for 0 length str…

…ing (#723)

* make IsValidAddr private and extend regex to account for 0 length strings

* add tests

* remove spaces and commas from LongString

modules/apps/27-interchain-accounts/types/account.go

@@ -21,9 +21,9 @@ var (
 // DefaultMaxAddrLength defines the default maximum character length used in validation of addresses
 var DefaultMaxAddrLength = 128
 
-// IsValidAddr defines a regular expression to check if the provided string consists of
-// strictly alphanumeric characters
-var IsValidAddr = regexp.MustCompile("^[a-zA-Z0-9]*$").MatchString
+// isValidAddr defines a regular expression to check if the provided string consists of
+// strictly alphanumeric characters and is non empty.
+var isValidAddr = regexp.MustCompile("^[a-zA-Z0-9]+$").MatchString
 
 // InterchainAccountI wraps the authtypes.AccountI interface
 type InterchainAccountI interface {
@@ -48,7 +48,7 @@ func GenerateAddress(moduleAccAddr sdk.AccAddress, portID string) sdk.AccAddress
 // ValidateAccountAddress performs basic validation of interchain account addresses, enforcing constraints
 // on address length and character set
 func ValidateAccountAddress(addr string) error {
-	if !IsValidAddr(addr) || len(addr) == 0 || len(addr) > DefaultMaxAddrLength {
+	if !isValidAddr(addr) || len(addr) > DefaultMaxAddrLength {
 		return sdkerrors.Wrapf(
 			ErrInvalidAccountAddress,
 			"address must contain strictly alphanumeric characters, not exceeding %d characters in length",

modules/apps/27-interchain-accounts/types/account_test.go

@@ -50,6 +50,52 @@ func (suite *TypesTestSuite) TestGenerateAddress() {
 	suite.Require().NotEmpty(accAddr)
 }
 
+func (suite *TypesTestSuite) TestValidateAccountAddress() {
+	testCases := []struct {
+		name    string
+		address string
+		expPass bool
+	}{
+		{
+			"success",
+			TestOwnerAddress,
+			true,
+		},
+		{
+			"success with single character",
+			"a",
+			true,
+		},
+		{
+			"empty string",
+			"",
+			false,
+		},
+		{
+			"only spaces",
+			"     ",
+			false,
+		},
+		{
+			"address is too long",
+			ibctesting.LongString,
+			false,
+		},
+	}
+
+	for _, tc := range testCases {
+		suite.Run(tc.name, func() {
+			err := types.ValidateAccountAddress(tc.address)
+
+			if tc.expPass {
+				suite.Require().NoError(err, tc.name)
+			} else {
+				suite.Require().Error(err, tc.name)
+			}
+		})
+	}
+}
+
 func (suite *TypesTestSuite) TestInterchainAccount() {
 	pubkey := secp256k1.GenPrivKey().PubKey()
 	addr := sdk.AccAddress(pubkey.Address())

testing/values.go

@@ -39,6 +39,8 @@ const (
 	// used for testing proposals
 	Title       = "title"
 	Description = "description"
+
+	LongString = "LoremipsumdolorsitameconsecteturadipiscingeliseddoeiusmodtemporincididuntutlaboreetdoloremagnaaliquUtenimadminimveniamquisnostrudexercitationullamcolaborisnisiutaliquipexeacommodoconsequDuisauteiruredolorinreprehenderitinvoluptateelitsseillumoloreufugiatnullaariaturEcepteurintoccaectupidatatonroidentuntnulpauifficiaeseruntmollitanimidestlaborum"
 )
 
 var (