Merge pull request #66 from AssetMantle/deepanshutr/master

Deepanshutr/master

Makefile

@@ -11,6 +11,8 @@ GOLANG_PROTOBUF_VERSION=1.28.0
 GOGO_PROTOBUF_VERSION=1.3.2
 GRPC_GATEWAY_VERSION=1.16.0
 
+export GO111MODULE = on
+
 #install all dependencies for buf
 install-buf-dependencies:
 	@go install github.com/cosmos/cosmos-proto/cmd/protoc-gen-go-pulsar@latest
@@ -28,12 +30,15 @@ install-buf-dependencies:
 	go get github.com/cosmos/[email protected]
 	rm -rf cosmos-proto protobuf
 
-export GO111MODULE = on
+protobuf-generate-go:
+	@cd proto; buf generate --template buf.gen.yaml
+	@cp -r github.com/AssetMantle/schema/* ./
+	@rm -rf github.com
 
 all: build test lintci
 
 # The below include contains the tools and runsim targets.
-include simulation/make/Makefile
+#include simulation/make/Makefile
 
 ########################################
 ### Build

go/codec/schema.go → codec/schema.go

@@ -6,20 +6,20 @@ package codec
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/AssetMantle/schema/go/data"
-	baseData "github.com/AssetMantle/schema/go/data/base"
-	"github.com/AssetMantle/schema/go/documents"
-	baseDocuments "github.com/AssetMantle/schema/go/documents/base"
-	"github.com/AssetMantle/schema/go/ids"
-	baseIDs "github.com/AssetMantle/schema/go/ids/base"
-	"github.com/AssetMantle/schema/go/lists"
-	baseLists "github.com/AssetMantle/schema/go/lists/base"
-	"github.com/AssetMantle/schema/go/properties"
-	baseProperties "github.com/AssetMantle/schema/go/properties/base"
-	"github.com/AssetMantle/schema/go/qualified"
-	baseQualified "github.com/AssetMantle/schema/go/qualified/base"
-	typesSchema "github.com/AssetMantle/schema/go/types"
-	baseTypes "github.com/AssetMantle/schema/go/types/base"
+	"github.com/AssetMantle/schema/data"
+	baseData "github.com/AssetMantle/schema/data/base"
+	"github.com/AssetMantle/schema/documents"
+	baseDocuments "github.com/AssetMantle/schema/documents/base"
+	"github.com/AssetMantle/schema/ids"
+	baseIDs "github.com/AssetMantle/schema/ids/base"
+	"github.com/AssetMantle/schema/lists"
+	baseLists "github.com/AssetMantle/schema/lists/base"
+	"github.com/AssetMantle/schema/properties"
+	baseProperties "github.com/AssetMantle/schema/properties/base"
+	"github.com/AssetMantle/schema/qualified"
+	baseQualified "github.com/AssetMantle/schema/qualified/base"
+	typesSchema "github.com/AssetMantle/schema/types"
+	baseTypes "github.com/AssetMantle/schema/types/base"
 )
 
 func RegisterLegacyAminoCodec(legacyAmino *codec.LegacyAmino) {

go/data/base/acc_address_data.go → data/base/acc_address_data.go

@@ -9,10 +9,10 @@ import (
 
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/AssetMantle/schema/go/data"
-	dataConstants "github.com/AssetMantle/schema/go/data/constants"
-	"github.com/AssetMantle/schema/go/ids"
-	baseIDs "github.com/AssetMantle/schema/go/ids/base"
+	"github.com/AssetMantle/schema/data"
+	dataConstants "github.com/AssetMantle/schema/data/constants"
+	"github.com/AssetMantle/schema/ids"
+	baseIDs "github.com/AssetMantle/schema/ids/base"
 )
 
 var _ data.AccAddressData = (*AccAddressData)(nil)

go/data/base/acc_address_data_test.go → data/base/acc_address_data_test.go

@@ -7,10 +7,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/AssetMantle/schema/go/data"
-	idsConstants "github.com/AssetMantle/schema/go/data/constants"
-	"github.com/AssetMantle/schema/go/ids"
-	baseIDs "github.com/AssetMantle/schema/go/ids/base"
+	"github.com/AssetMantle/schema/data"
+	idsConstants "github.com/AssetMantle/schema/data/constants"
+	"github.com/AssetMantle/schema/ids"
+	baseIDs "github.com/AssetMantle/schema/ids/base"
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 

go/data/base/any_data.go → data/base/any_data.go

@@ -2,10 +2,10 @@ package base
 
 import (
 	"fmt"
-	"github.com/AssetMantle/schema/go/data"
-	dataConstants "github.com/AssetMantle/schema/go/data/constants"
-	"github.com/AssetMantle/schema/go/ids"
-	baseIDs "github.com/AssetMantle/schema/go/ids/base"
+	"github.com/AssetMantle/schema/data"
+	dataConstants "github.com/AssetMantle/schema/data/constants"
+	"github.com/AssetMantle/schema/ids"
+	baseIDs "github.com/AssetMantle/schema/ids/base"
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	"strings"
 )

go/data/base/any_data_test.go → data/base/any_data_test.go

@@ -10,9 +10,9 @@ import (
 
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/AssetMantle/schema/go/data"
-	baseIDs "github.com/AssetMantle/schema/go/ids/base"
-	baseTypes "github.com/AssetMantle/schema/go/types/base"
+	"github.com/AssetMantle/schema/data"
+	baseIDs "github.com/AssetMantle/schema/ids/base"
+	baseTypes "github.com/AssetMantle/schema/types/base"
 )
 
 var (

go/data/base/any_listable_data.go → data/base/any_listable_data.go

@@ -3,8 +3,8 @@ package base
 import (
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/AssetMantle/schema/go/data"
-	"github.com/AssetMantle/schema/go/ids"
+	"github.com/AssetMantle/schema/data"
+	"github.com/AssetMantle/schema/ids"
 )
 
 type listableDataGetter interface {