chore: address review changes

regen-network · Sep 29, 2021 · 5dc114c · 5dc114c
1 parent 90f9312
commit 5dc114c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/x/ecocredit/client/testsuite/query.go b/x/ecocredit/client/testsuite/query.go
@@ -266,7 +266,7 @@ func (s *IntegrationTestSuite) TestQueryBatchInfo() {
 			name:           "malformed batch denom",
 			args:           []string{"abcde"},
 			expectErr:      true,
-			expectedErrMsg: "denomination didn't match the format",
+			expectedErrMsg: "invalid denom",
 		},
 		{
 			name:           "non-existent credit batch",

diff --git a/x/ecocredit/client/testsuite/tx.go b/x/ecocredit/client/testsuite/tx.go
@@ -3,6 +3,8 @@ package testsuite
 import (
 	"encoding/base64"
 	"fmt"
+	"strings"
+
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -17,7 +19,6 @@ import (
 	"github.com/regen-network/regen-ledger/x/ecocredit/client"
 	"github.com/stretchr/testify/suite"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
-	"strings"
 )
 
 type IntegrationTestSuite struct {
@@ -795,7 +796,7 @@ func (s *IntegrationTestSuite) TestTxSend() {
 				s.commonTxFlags()...,
 			),
 			expectErr:      true,
-			expectedErrMsg: "denomination didn't match the format",
+			expectedErrMsg: "invalid denom",
 		},
 		{
 			name: "invalid tradable amount",
@@ -946,7 +947,7 @@ func (s *IntegrationTestSuite) TestTxRetire() {
 				s.commonTxFlags()...,
 			),
 			expectErr:      true,
-			expectedErrMsg: "denomination didn't match the format",
+			expectedErrMsg: "invalid denom",
 		},
 		{
 			name: "invalid amount",

diff --git a/x/ecocredit/denom.go b/x/ecocredit/denom.go
@@ -72,7 +72,7 @@ func ValidateClassID(classId string) error {
 func ValidateDenom(denom string) error {
 	matches := reFullBatchDenom.FindStringSubmatch(denom)
 	if matches == nil {
-		return ErrParseFailure.Wrapf("denomination didn't match the format: expected A00-00000000-00000000-000, got %s", denom)
+		return ErrParseFailure.Wrap("invalid denom. Valid denom format is: A00-00000000-00000000-000")
 	}
 	return nil
 }
diff --git a/x/ecocredit/server/testsuite/queries.go b/x/ecocredit/server/testsuite/queries.go
@@ -159,7 +159,7 @@ func (s *IntegrationTestSuite) TestQueryBatchInfo() {
 			"empty batch denom",
 			&ecocredit.QueryBatchInfoRequest{},
 			true,
-			"denomination didn't match the format",
+			"invalid denom",
 		},
 		{
 			"batch not found",