refactor: move empty string validation into core utils.go

x/ecocredit/basket/features/msg_create.feature

@@ -227,7 +227,7 @@ Feature: MsgCreate
     }
     """
     When the message is validated
-    Then expect the error "allowed_classes[0] cannot be empty: invalid request"
+    Then expect the error "allowed_classes[0] is not a valid class ID: class id cannot be empty: invalid request: invalid request"
 
   Scenario: an error is returned if an allowed credit class is not formatted
     Given the message
@@ -242,7 +242,7 @@ Feature: MsgCreate
     }
     """
     When the message is validated
-    Then expect the error "allowed_classes[0] is not a valid class ID: class ID didn't match the format: expected A00, got foo: parse error: invalid request"
+    Then expect the error "allowed_classes[0] is not a valid class ID: class ID didn't match the format: expected A00, got foo: invalid request: invalid request"
 
   Scenario Outline: an error is returned if more than one data criteria is provided
     Given the message

x/ecocredit/basket/features/msg_put.feature

@@ -79,7 +79,7 @@ Feature: MsgPut
     }
     """
     When the message is validated
-    Then expect the error "credit batch denom cannot be empty: invalid request"
+    Then expect the error "batch denom cannot be empty: invalid request"
 
   Scenario: an error is returned if a credit batch denom is not formatted
     Given the message
@@ -95,7 +95,7 @@ Feature: MsgPut
     }
     """
     When the message is validated
-    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: parse error: invalid request"
+    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"
 
   Scenario: an error is returned if a credit amount is empty
     Given the message

x/ecocredit/basket/features/msg_take.feature

@@ -125,7 +125,7 @@ Feature: MsgTake
     }
     """
     When the message is validated
-    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error: invalid request"
+    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request: invalid request"
 
   Scenario: no error is returned if retirement jurisdiction is not formatted and retire on take is false
     Given the message

x/ecocredit/basket/msg_create.go

@@ -42,10 +42,6 @@ func (m MsgCreate) ValidateBasic() error {
 		return sdkerrors.ErrInvalidRequest.Wrapf("description length cannot be greater than %d characters", descrMaxLen)
 	}
 
-	if len(m.CreditTypeAbbrev) == 0 {
-		return sdkerrors.ErrInvalidRequest.Wrapf("credit type abbreviation cannot be empty")
-	}
-
 	if err := core.ValidateCreditTypeAbbreviation(m.CreditTypeAbbrev); err != nil {
 		return err
 	}
@@ -55,9 +51,6 @@ func (m MsgCreate) ValidateBasic() error {
 	}
 
 	for i := range m.AllowedClasses {
-		if m.AllowedClasses[i] == "" {
-			return sdkerrors.ErrInvalidRequest.Wrapf("allowed_classes[%d] cannot be empty", i)
-		}
 		if err := core.ValidateClassId(m.AllowedClasses[i]); err != nil {
 			return sdkerrors.ErrInvalidRequest.Wrapf("allowed_classes[%d] is not a valid class ID: %s", i, err)
 		}

x/ecocredit/basket/msg_put.go

@@ -39,12 +39,8 @@ func (m MsgPut) ValidateBasic() error {
 
 	if len(m.Credits) > 0 {
 		for _, credit := range m.Credits {
-			if len(credit.BatchDenom) == 0 {
-				return sdkerrors.ErrInvalidRequest.Wrap("credit batch denom cannot be empty")
-			}
-
 			if err := core.ValidateBatchDenom(credit.BatchDenom); err != nil {
-				return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+				return err
 			}
 
 			if len(credit.Amount) == 0 {

x/ecocredit/core/features/msg_bridge.feature

@@ -144,7 +144,7 @@ Feature: MsgBridge
     }
     """
     When the message is validated
-    Then expect the error "credits[0]: invalid batch denom: expected format A00-000-00000000-00000000-000: parse error"
+    Then expect the error "credits[0]: invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"
 
   Scenario: an error is returned if credits amount is empty
     Given the message

x/ecocredit/core/features/msg_bridge_receive.feature

@@ -65,7 +65,7 @@ Feature: MsgBridgeReceive
     }
     """
     When the message is validated
-    Then expect the error "class ID didn't match the format: expected A00, got foo: parse error: invalid request"
+    Then expect the error "class ID didn't match the format: expected A00, got foo: invalid request"
 
   Scenario: an error is returned if project is empty
     Given the message
@@ -114,7 +114,7 @@ Feature: MsgBridgeReceive
     }
     """
     When the message is validated
-    Then expect the error "project jurisdiction cannot be empty: invalid request"
+    Then expect the error "jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request: invalid request"
 
   Scenario: an error is returned if project jurisdiction is not formatted
     Given the message
@@ -129,7 +129,7 @@ Feature: MsgBridgeReceive
     }
     """
     When the message is validated
-    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error: invalid request"
+    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request: invalid request"
 
   Scenario: an error is returned if project metadata is empty
     Given the message

x/ecocredit/core/features/msg_create_project.feature

@@ -77,7 +77,7 @@ Feature: MsgCreateProject
     }
     """
     When the message is validated
-    Then expect the error "class ID didn't match the format: expected A00, got foo: parse error"
+    Then expect the error "class ID didn't match the format: expected A00, got foo: invalid request"
 
   Scenario: an error is returned if metadata is exceeds 256 characters
     Given the message
@@ -101,7 +101,7 @@ Feature: MsgCreateProject
     }
     """
     When the message is validated
-    Then expect the error "jurisdiction cannot be empty: invalid request"
+    Then expect the error "jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
 
   Scenario: an error is returned if jurisdiction is not formatted
     Given the message
@@ -114,7 +114,7 @@ Feature: MsgCreateProject
     }
     """
     When the message is validated
-    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error"
+    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
 
   Scenario: an error is returned if reference id is exceeds 32 characters
     Given the message

x/ecocredit/core/features/msg_mint_batch_credits.feature

@@ -86,7 +86,7 @@ Feature: MsgMintBatchCredits
     }
     """
     When the message is validated
-    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: parse error"
+    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"
 
   Scenario: an error is returned if issuance is empty
    Given the message

x/ecocredit/core/features/msg_retire.feature

@@ -110,7 +110,7 @@ Feature: MsgRetire
     }
     """
     When the message is validated
-    Then expect the error "jurisdiction cannot be empty: invalid request"
+    Then expect the error "jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
 
   Scenario: an error is returned if jurisdiction is not formatted
     Given the message
@@ -127,4 +127,21 @@ Feature: MsgRetire
     }
     """
     When the message is validated
-    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error"
+    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
+
+  Scenario: an error is returned if jurisdiction is an empty string
+    Given the message
+    """
+    {
+      "owner": "regen1depk54cuajgkzea6zpgkq36tnjwdzv4ak663u6",
+      "credits": [
+        {
+          "batch_denom": "C01-001-20200101-20210101-001",
+          "amount": "100"
+        }
+      ],
+      "jurisdiction": ""
+    }
+    """
+    When the message is validated
+    Then expect the error "jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"

x/ecocredit/core/features/msg_seal_batch.feature

@@ -48,4 +48,4 @@ Feature: MsgSealBatch
     }
     """
     When the message is validated
-    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: parse error"
+    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"

x/ecocredit/core/features/msg_send.feature

@@ -119,7 +119,7 @@ Feature: MsgSend
     }
     """
     When the message is validated
-    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: parse error"
+    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"
 
   Scenario: an error is returned if credits tradable amount and retired amount are empty
     Given the message
@@ -186,7 +186,7 @@ Feature: MsgSend
     }
     """
     When the message is validated
-    Then expect the error "retirement jurisdiction required: invalid request"
+    Then expect the error "retirement jurisdiction: jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
 
   Scenario: an error is returned if credits retired amount is positive and retirement jurisdiction is not formatted
     Given the message
@@ -204,4 +204,4 @@ Feature: MsgSend
     }
     """
     When the message is validated
-    Then expect the error "invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error"
+    Then expect the error "retirement jurisdiction: invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"

x/ecocredit/core/features/msg_update_class_admin.feature

@@ -49,7 +49,7 @@ Feature: MsgUpdateClassAdmin
     }
     """
     When the message is validated
-    Then expect the error "class ID didn't match the format: expected A00, got foo: parse error"
+    Then expect the error "class ID didn't match the format: expected A00, got foo: invalid request"
 
   Scenario: an error is returned if new admin is empty
     Given the message

x/ecocredit/core/features/msg_update_class_issuers.feature

@@ -82,7 +82,7 @@ Feature: MsgUpdateClassIssuers
     }
     """
     When the message is validated
-    Then expect the error "class ID didn't match the format: expected A00, got foo: parse error"
+    Then expect the error "class ID didn't match the format: expected A00, got foo: invalid request"
 
   Scenario: an error is returned if new issuers and remove issuers is empty
     Given the message

x/ecocredit/core/features/msg_update_class_metadata.feature

@@ -60,7 +60,7 @@ Feature: MsgUpdateClassMetadata
     }
     """
     When the message is validated
-    Then expect the error "class ID didn't match the format: expected A00, got foo: parse error"
+    Then expect the error "class ID didn't match the format: expected A00, got foo: invalid request"
 
   Scenario: an error is returned if new metadata exceeds 256 characters
     Given the message

x/ecocredit/core/features/types_batch_issuance.feature

@@ -95,7 +95,7 @@ Feature: BatchIssuance
     }
     """
     When the batch issuance is validated
-    Then expect the error "retirement jurisdiction cannot be empty: invalid request"
+    Then expect the error "retirement jurisdiction: jurisdiction cannot be empty, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"
 
   Scenario: an error is returned if issuance retired amount is positive and jurisdiction is not formatted
     Given the batch issuance
@@ -107,4 +107,4 @@ Feature: BatchIssuance
     }
     """
     When the batch issuance is validated
-    Then expect the error "retirement jurisdiction: invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: parse error"
+    Then expect the error "retirement jurisdiction: invalid jurisdiction: foo, expected format <country-code>[-<region-code>[ <postal-code>]]: invalid request"

x/ecocredit/core/features/types_credits.feature

@@ -27,7 +27,7 @@ Feature: Credits
     }
     """
     When the message is validated
-    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: parse error"
+    Then expect the error "invalid batch denom: expected format A00-000-00000000-00000000-000: invalid request"
 
   Scenario: an error is returned if amount is empty
     Given the message

x/ecocredit/core/msg_bridge.go

@@ -53,10 +53,6 @@ func (m *MsgBridge) ValidateBasic() error {
 	for i, credit := range m.Credits {
 		creditIndex := fmt.Sprintf("credits[%d]", i)
 
-		if credit.BatchDenom == "" {
-			return sdkerrors.ErrInvalidRequest.Wrapf("%s: batch denom cannot be empty", creditIndex)
-		}
-
 		if err := ValidateBatchDenom(credit.BatchDenom); err != nil {
 			return sdkerrors.Wrapf(err, "%s", creditIndex)
 		}

x/ecocredit/core/msg_bridge_receive.go

@@ -29,12 +29,8 @@ func (m *MsgBridgeReceive) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("issuer: %s", err)
 	}
 
-	if m.ClassId == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("class id cannot be empty")
-	}
-
 	if err := ValidateClassId(m.ClassId); err != nil {
-		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
+		return err
 	}
 
 	// project validation
@@ -51,10 +47,6 @@ func (m *MsgBridgeReceive) ValidateBasic() error {
 		return ecocredit.ErrMaxLimit.Wrapf("project reference id: max length %d", MaxReferenceIdLength)
 	}
 
-	if m.Project.Jurisdiction == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("project jurisdiction cannot be empty")
-	}
-
 	if err := ValidateJurisdiction(m.Project.Jurisdiction); err != nil {
 		return sdkerrors.ErrInvalidRequest.Wrap(err.Error())
 	}

x/ecocredit/core/msg_create_batch.go

@@ -27,10 +27,6 @@ func (m *MsgCreateBatch) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("issuer: %s", err)
 	}
 
-	if m.ProjectId == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("project id cannot be empty")
-	}
-
 	if err := ValidateProjectId(m.ProjectId); err != nil {
 		return err
 	}

x/ecocredit/core/msg_create_class.go

@@ -52,10 +52,6 @@ func (m *MsgCreateClass) ValidateBasic() error {
 		return ecocredit.ErrMaxLimit.Wrapf("metadata: max length %d", MaxMetadataLength)
 	}
 
-	if m.CreditTypeAbbrev == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("credit type abbreviation cannot be empty")
-	}
-
 	if err := ValidateCreditTypeAbbreviation(m.CreditTypeAbbrev); err != nil {
 		return err
 	}

x/ecocredit/core/msg_create_project.go

@@ -29,10 +29,6 @@ func (m *MsgCreateProject) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("admin: %s", err)
 	}
 
-	if m.ClassId == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("class id cannot be empty")
-	}
-
 	if err := ValidateClassId(m.ClassId); err != nil {
 		return err
 	}
@@ -41,10 +37,6 @@ func (m *MsgCreateProject) ValidateBasic() error {
 		return ecocredit.ErrMaxLimit.Wrapf("metadata: max length %d", MaxMetadataLength)
 	}
 
-	if m.Jurisdiction == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("jurisdiction cannot be empty")
-	}
-
 	if err := ValidateJurisdiction(m.Jurisdiction); err != nil {
 		return err
 	}

x/ecocredit/core/msg_mint_batch_credits.go

@@ -27,10 +27,6 @@ func (m *MsgMintBatchCredits) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("issuer: %s", err)
 	}
 
-	if m.BatchDenom == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("batch denom cannot be empty")
-	}
-
 	if err := ValidateBatchDenom(m.BatchDenom); err != nil {
 		return err
 	}

x/ecocredit/core/msg_retire.go

@@ -37,10 +37,6 @@ func (m *MsgRetire) ValidateBasic() error {
 		}
 	}
 
-	if m.Jurisdiction == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("jurisdiction cannot be empty")
-	}
-
 	if err := ValidateJurisdiction(m.Jurisdiction); err != nil {
 		return err
 	}

x/ecocredit/core/msg_seal_batch.go

@@ -27,10 +27,6 @@ func (m *MsgSealBatch) ValidateBasic() error {
 		return sdkerrors.ErrInvalidAddress.Wrapf("issuer: %s", err)
 	}
 
-	if m.BatchDenom == "" {
-		return sdkerrors.ErrInvalidRequest.Wrap("batch denom cannot be empty")
-	}
-
 	return ValidateBatchDenom(m.BatchDenom)
 }