Merge pull request #1653 from mesg-foundation/refactor/cosmos-instanc…

…e-module

Refactor/cosmos instance module

app/app.go

@@ -29,10 +29,10 @@ import (
 	mesgcodec "github.com/mesg-foundation/engine/codec"
 	"github.com/mesg-foundation/engine/cosmos"
 	executionsdk "github.com/mesg-foundation/engine/sdk/execution"
-	instancesdk "github.com/mesg-foundation/engine/sdk/instance"
 	processsdk "github.com/mesg-foundation/engine/sdk/process"
 	runnersdk "github.com/mesg-foundation/engine/sdk/runner"
 	servicesdk "github.com/mesg-foundation/engine/sdk/service"
+	"github.com/mesg-foundation/engine/x/instance"
 	"github.com/mesg-foundation/engine/x/ownership"
 )
 
@@ -60,8 +60,8 @@ var (
 
 		// Engine's AppModuleBasic
 		ownership.AppModuleBasic{},
+		instance.AppModuleBasic{},
 		cosmos.NewAppModuleBasic(servicesdk.ModuleName),
-		cosmos.NewAppModuleBasic(instancesdk.ModuleName),
 		cosmos.NewAppModuleBasic(runnersdk.ModuleName),
 		cosmos.NewAppModuleBasic(executionsdk.ModuleName),
 		cosmos.NewAppModuleBasic(processsdk.ModuleName),
@@ -116,8 +116,8 @@ type NewApp struct {
 
 	// Engine's keepers
 	ownershipKeeper ownership.Keeper
+	instanceKeeper  instance.Keeper
 	serviceKeeper   *servicesdk.Keeper
-	instanceKeeper  *instancesdk.Keeper
 	runnerKeeper    *runnersdk.Keeper
 	processKeeper   *processsdk.Keeper
 	executionKeeper *executionsdk.Keeper
@@ -156,8 +156,8 @@ func NewInitApp(
 
 		// Engine's module keys
 		ownership.ModuleName,
+		instance.ModuleName,
 		servicesdk.ModuleName,
-		instancesdk.ModuleName,
 		runnersdk.ModuleName,
 		executionsdk.ModuleName,
 		processsdk.ModuleName,
@@ -243,8 +243,8 @@ func NewInitApp(
 
 	// Engine's module keepers
 	app.ownershipKeeper = ownership.NewKeeper(app.cdc, keys[ownership.StoreKey])
+	app.instanceKeeper = instance.NewKeeper(app.cdc, keys[instance.StoreKey])
 	app.serviceKeeper = servicesdk.NewKeeper(keys[servicesdk.ModuleName], app.ownershipKeeper)
-	app.instanceKeeper = instancesdk.NewKeeper(keys[instancesdk.ModuleName])
 	app.runnerKeeper = runnersdk.NewKeeper(keys[runnersdk.ModuleName], app.instanceKeeper)
 	app.processKeeper = processsdk.NewKeeper(keys[processsdk.ModuleName], app.ownershipKeeper, app.instanceKeeper)
 	app.executionKeeper = executionsdk.NewKeeper(keys[executionsdk.ModuleName], app.serviceKeeper, app.instanceKeeper, app.runnerKeeper, app.processKeeper)
@@ -261,8 +261,8 @@ func NewInitApp(
 
 		// Engine's modules
 		ownership.NewAppModule(app.ownershipKeeper),
+		instance.NewAppModule(app.instanceKeeper),
 		servicesdk.NewModule(app.serviceKeeper),
-		instancesdk.NewModule(app.instanceKeeper),
 		runnersdk.NewModule(app.runnerKeeper),
 		executionsdk.NewModule(app.executionKeeper),
 		processsdk.NewModule(app.processKeeper),
@@ -288,8 +288,8 @@ func NewInitApp(
 
 		// Engine's modules
 		ownership.ModuleName,
+		instance.ModuleName,
 		servicesdk.ModuleName,
-		instancesdk.ModuleName,
 		runnersdk.ModuleName,
 		executionsdk.ModuleName,
 		processsdk.ModuleName,

sdk/event/event.go

@@ -1,12 +1,16 @@
 package eventsdk
 
 import (
+	"fmt"
+
 	"github.com/cskr/pubsub"
+	"github.com/mesg-foundation/engine/cosmos"
 	"github.com/mesg-foundation/engine/event"
 	"github.com/mesg-foundation/engine/hash"
+	instancepb "github.com/mesg-foundation/engine/instance"
 	"github.com/mesg-foundation/engine/protobuf/types"
-	instancesdk "github.com/mesg-foundation/engine/sdk/instance"
 	servicesdk "github.com/mesg-foundation/engine/sdk/service"
+	"github.com/mesg-foundation/engine/x/instance"
 )
 
 const (
@@ -16,30 +20,30 @@ const (
 
 // Event exposes event APIs of MESG.
 type Event struct {
-	ps       *pubsub.PubSub
-	instance *instancesdk.SDK
-	service  *servicesdk.SDK
+	ps      *pubsub.PubSub
+	client  *cosmos.Client
+	service *servicesdk.SDK
 }
 
 // New creates a new Event SDK with given options.
-func New(ps *pubsub.PubSub, service *servicesdk.SDK, instance *instancesdk.SDK) *Event {
+func New(ps *pubsub.PubSub, service *servicesdk.SDK, client *cosmos.Client) *Event {
 	return &Event{
-		ps:       ps,
-		service:  service,
-		instance: instance,
+		ps:      ps,
+		client:  client,
+		service: service,
 	}
 }
 
 // Create a MESG event eventKey with eventData for service token.
 func (e *Event) Create(instanceHash hash.Hash, eventKey string, eventData *types.Struct) (*event.Event, error) {
 	event := event.Create(instanceHash, eventKey, eventData)
 
-	instance, err := e.instance.Get(event.InstanceHash)
-	if err != nil {
+	var inst instancepb.Instance
+	if err := e.client.QueryJSON(fmt.Sprintf("custom/%s/%s/%s", instance.QuerierRoute, instance.QueryGetInstance, event.InstanceHash), nil, &inst); err != nil {
 		return nil, err
 	}
 
-	service, err := e.service.Get(instance.ServiceHash)
+	service, err := e.service.Get(inst.ServiceHash)
 	if err != nil {
 		return nil, err
 	}

sdk/execution/keeper.go

@@ -10,23 +10,23 @@ import (
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/protobuf/api"
 	"github.com/mesg-foundation/engine/protobuf/types"
-	instancesdk "github.com/mesg-foundation/engine/sdk/instance"
 	processsdk "github.com/mesg-foundation/engine/sdk/process"
 	runnersdk "github.com/mesg-foundation/engine/sdk/runner"
 	servicesdk "github.com/mesg-foundation/engine/sdk/service"
+	"github.com/mesg-foundation/engine/x/instance"
 )
 
 // Keeper holds the logic to read and write data.
 type Keeper struct {
 	storeKey       *cosmostypes.KVStoreKey
 	serviceKeeper  *servicesdk.Keeper
-	instanceKeeper *instancesdk.Keeper
+	instanceKeeper instance.Keeper
 	runnerKeeper   *runnersdk.Keeper
 	processKeeper  *processsdk.Keeper
 }
 
 // NewKeeper initialize a new keeper.
-func NewKeeper(storeKey *cosmostypes.KVStoreKey, serviceKeeper *servicesdk.Keeper, instanceKeeper *instancesdk.Keeper, runnerKeeper *runnersdk.Keeper, processKeeper *processsdk.Keeper) *Keeper {
+func NewKeeper(storeKey *cosmostypes.KVStoreKey, serviceKeeper *servicesdk.Keeper, instanceKeeper instance.Keeper, runnerKeeper *runnersdk.Keeper, processKeeper *processsdk.Keeper) *Keeper {
 	return &Keeper{
 		storeKey:       storeKey,
 		serviceKeeper:  serviceKeeper,

sdk/execution/sdk.go

@@ -7,7 +7,6 @@ import (
 	"github.com/mesg-foundation/engine/execution"
 	"github.com/mesg-foundation/engine/hash"
 	"github.com/mesg-foundation/engine/protobuf/api"
-	instancesdk "github.com/mesg-foundation/engine/sdk/instance"
 	runnersdk "github.com/mesg-foundation/engine/sdk/runner"
 	servicesdk "github.com/mesg-foundation/engine/sdk/service"
 )
@@ -16,18 +15,16 @@ import (
 type SDK struct {
 	client *cosmos.Client
 
-	serviceSDK  *servicesdk.SDK
-	instanceSDK *instancesdk.SDK
-	runnerSDK   *runnersdk.SDK
+	serviceSDK *servicesdk.SDK
+	runnerSDK  *runnersdk.SDK
 }
 
 // New returns the execution sdk.
-func New(client *cosmos.Client, serviceSDK *servicesdk.SDK, instanceSDK *instancesdk.SDK, runnerSDK *runnersdk.SDK) *SDK {
+func New(client *cosmos.Client, serviceSDK *servicesdk.SDK, runnerSDK *runnersdk.SDK) *SDK {
 	sdk := &SDK{
-		client:      client,
-		serviceSDK:  serviceSDK,
-		instanceSDK: instanceSDK,
-		runnerSDK:   runnerSDK,
+		client:     client,
+		serviceSDK: serviceSDK,
+		runnerSDK:  runnerSDK,
 	}
 	return sdk
 }