Merge branch 'master' into ryan/1032-project-id-batch-denom

app/app.go

@@ -384,7 +384,6 @@ func NewRegenApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		app.BankKeeper,
 		app.DistrKeeper,
 	)
-
 	dataModule := data.NewModule(app.AccountKeeper, app.BankKeeper)
 	newModules := []moduletypes.Module{ecocreditModule, dataModule}
 	err := app.smm.RegisterModules(newModules)

app/testsuite/modules_test.go

@@ -6,13 +6,12 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	data "github.com/regen-network/regen-ledger/x/data/client/testsuite"
-	ecocredit "github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
+	"github.com/regen-network/regen-ledger/x/ecocredit/client/testsuite"
 )
 
 func TestEcocreditIntegration(t *testing.T) {
 	cfg := DefaultConfig()
-
-	ecocredit.RunCLITests(t, cfg)
+	testsuite.RunCLITests(t, cfg)
 }
 
 func TestDataIntegration(t *testing.T) {

proto/regen/data/v1/events.proto

@@ -19,3 +19,18 @@ message EventAttest {
   // the data.
   string attestor = 2;
 }
+
+// EventDefineResolver is an event emitted when a resolved is defined on chain.
+message EventDefineResolver {
+  // id is the ID of the defined resolver.
+  uint64 id = 1;
+}
+
+// EventRegisterResolver is an event emitted when data is registered to a resolver on chain.
+message EventRegisterResolver {
+  // id is the ID of the resolver that the data was registered to.
+  uint64 id = 1;
+
+  // iri is the IRI of the data that was registered.
+  string iri = 2;
+}

proto/regen/ecocredit/v1/types.proto

@@ -31,9 +31,6 @@ message Params {
   // creation
   bool allowlist_enabled = 4;
 
-  // credit_types is a list of definitions for credit types
-  repeated CreditType credit_types = 5;
-
   // allowed_ask_denoms is a list of denoms (and display information) allowed to
   // be used in sell order ask prices.
   repeated AskDenom allowed_ask_denoms = 6;

types/module/server/testutil.go

@@ -6,22 +6,23 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/regen-network/regen-ledger/types/testutil"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+
+	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/log"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/stretchr/testify/require"
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	dbm "github.com/tendermint/tm-db"
-	"google.golang.org/grpc"
 
 	regentypes "github.com/regen-network/regen-ledger/types"
 	"github.com/regen-network/regen-ledger/types/module"
+	"github.com/regen-network/regen-ledger/types/testutil"
 )
 
 type FixtureFactory struct {