fix(x/ecocredit): impl AminoMarshaler for DateCriteria

x/ecocredit/basket/date_criteria.go

@@ -1,6 +1,7 @@
 package basket
 
 import (
+ "github.com/cosmos/cosmos-sdk/codec"
  "google.golang.org/protobuf/types/known/durationpb"
  "google.golang.org/protobuf/types/known/timestamppb"
 
@@ -21,3 +22,21 @@ func (d *DateCriteria) ToApi() *basketv1.DateCriteria {
  }
  return nil
 }
+
+var _ codec.AminoMarshaler = &DateCriteria{}
+
+func (d DateCriteria) MarshalAminoJSON() ([]byte, error) {
+ return d.Marshal()
+}
+
+func (d *DateCriteria) UnmarshalAminoJSON(bytes []byte) error {
+ return d.Unmarshal(bytes)
+}
+
+func (d DateCriteria) MarshalAmino() ([]byte, error) {
+ return d.Marshal()
+}
+
+func (d *DateCriteria) UnmarshalAmino(bytes []byte) error {
+ return d.Unmarshal(bytes)
+}

x/ecocredit/basket/date_criteria_test.go

@@ -1,6 +1,8 @@
 package basket
 
 import (
+ "github.com/cosmos/cosmos-sdk/codec"
+ "gotest.tools/v3/assert"
  "testing"
 
  "github.com/gogo/protobuf/types"
@@ -27,3 +29,31 @@ func TestDateCriteriaToApi(t *testing.T) {
  require.NotNil(dw)
  require.Equal(durStd, dw.AsDuration(), "handles window date")
 }
+
+func TestAminoDate(t *testing.T) {
+ cdc := codec.NewLegacyAmino()
+ dur := types.Duration{Seconds: 50}
+ bsk := MsgCreate{
+ Name: "foo",
+ DateCriteria: &DateCriteria{Sum: &DateCriteria_StartDateWindow{StartDateWindow: &dur}},
+ Exponent: 32,
+ }
+
+ // test Un/MarshalJSON
+ bz, err := cdc.MarshalJSON(bsk)
+ assert.NilError(t, err)
+ var bsk2 MsgCreate
+ err = cdc.UnmarshalJSON(bz, &bsk2)
+ assert.NilError(t, err)
+
+ // test regular Un/Marshal
+ bz, err = cdc.Marshal(bsk)
+ assert.NilError(t, err)
+ var bsk3 MsgCreate
+ err = cdc.Unmarshal(bz, &bsk3)
+ assert.NilError(t, err)
+
+
+ assert.DeepEqual(t, bsk, bsk2)
+ assert.DeepEqual(t, bsk2, bsk3)
+}

x/ecocredit/client/testsuite/tx.go

@@ -18,7 +18,6 @@ import (
  "github.com/regen-network/regen-ledger/types/testutil/network"
  "github.com/regen-network/regen-ledger/x/ecocredit"
  "github.com/regen-network/regen-ledger/x/ecocredit/client"
- "github.com/stretchr/testify/require"
  "github.com/stretchr/testify/suite"
  tmcli "github.com/tendermint/tendermint/libs/cli"
 )
@@ -45,14 +44,6 @@ var validMetadataBytes = []byte{0x1}
 
 func RunCLITests(t *testing.T, cfg network.Config) {
  suite.Run(t, NewIntegrationTestSuite(cfg))
-
- // setup another cfg for testing ecocredit enabled class creators list.
- genesisState := ecocredit.DefaultGenesisState()
- genesisState.Params.AllowlistEnabled = true
- bz, err := cfg.Codec.MarshalJSON(genesisState)
- require.NoError(t, err)
- cfg.GenesisState[ecocredit.ModuleName] = bz
- suite.Run(t, NewAllowListEnabledTestSuite(cfg))
 }
 
 func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {

x/ecocredit/server/testsuite/suite.go

@@ -1038,6 +1038,7 @@ func (s *IntegrationTestSuite) TestScenario() {
  allowlist []string
  allowlistEnabled bool
  wantErr bool
+ errMsg string
  }{
  {
  name: "valid allowlist and enabled",
@@ -1059,6 +1060,7 @@ func (s *IntegrationTestSuite) TestScenario() {
  creatorAcc: s.signers[1],
  allowlistEnabled: true,
  wantErr: true,
+ errMsg: "not allowed",
  },
  {
  name: "valid allowlist but disabled - anyone can create credits",
@@ -1073,6 +1075,7 @@ func (s *IntegrationTestSuite) TestScenario() {
  creatorAcc: s.signers[0],
  allowlistEnabled: true,
  wantErr: true,
+ errMsg: "not allowed",
  },
  }