Merge branch 'develop' into feat/codegen-fx

ilgooz · ilgooz · commit 0fb96e5f701e · 2021-03-03T05:19:16.000-08:00
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -15,21 +15,16 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
-          stable: false
+          go-version: 1.16
 
       - name: Set up Node
         uses: actions/setup-node@v2-beta
         with:
-          node-version: "14"
-
-      - name: Set up packr2
-        run: go get -u github.com/gobuffalo/packr/v2/packr2
+          node-version: 14
 
       - name: Set up Snapcraft
         run: |
           sudo apt-get update && sudo apt-get -yq --no-install-suggests --no-install-recommends install snapcraft
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -40,20 +35,11 @@ jobs:
         working-directory: ${{ env.working-directory }}
         run:  make ui
 
-      - name: Run packr2
-        working-directory: ${{ env.working-directory }}
-        run: |
-          export GOPATH=$GITHUB_WORKSPACE/go
-          export PATH=$PATH:$GOPATH
-          cd starport/interface/cli/starport
-          packr2 -v
-
       - name: Snapcraft Login
         env:
           SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }}
         run: |
           snapcraft login --with <(echo "$SNAPCRAFT_LOGIN")
-
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,8 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
-          stable: false
+          go-version: 1.16
 
       - uses: actions/checkout@v2
 
@@ -25,4 +24,3 @@ jobs:
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
           skip-go-installation: true
-
diff --git a/.github/workflows/semantic-pull-request.yml b/.github/workflows/semantic-pull-request.yml
@@ -11,4 +11,4 @@ jobs:
     steps:
       - uses: amannn/action-semantic-pull-request@v1.2.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -16,20 +16,16 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
-          stable: false
+          go-version: 1.16
 
       - name: Set up Node
         uses: actions/setup-node@v2-beta
         with:
-          node-version: "14"
+          node-version: 14
 
       - name: Install protoc
         uses: arduino/setup-protoc@v1
 
-      - name: Set up packr2
-        run: go get -u github.com/gobuffalo/packr/v2/packr2
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -40,14 +36,6 @@ jobs:
         working-directory: ${{ env.working-directory }}
         run: make ui
 
-      - name: Run packr2
-        working-directory: ${{ env.working-directory }}
-        run: |
-          export GOPATH=$GITHUB_WORKSPACE/go
-          export PATH=$PATH:$GOPATH
-          cd starport/interface/cli/starport
-          packr2 -v
-
       - name: Install Starport
         working-directory: ${{ env.working-directory }}
         run: |
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -17,8 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
-          stable: false
+          go-version: 1.16
 
       - name: "Get Go 1.15"	
         run: |	
@@ -28,9 +27,6 @@ jobs:
       - name: Install protoc
         uses: arduino/setup-protoc@v1
 
-      - name: Set up packr2
-        run: go get -u github.com/gobuffalo/packr/v2/packr2
-
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -41,14 +37,6 @@ jobs:
         working-directory: ${{ env.working-directory }}
         run: make ui
 
-      - name: Run packr2
-        working-directory: ${{ env.working-directory }}
-        run: |
-          export GOPATH=$GITHUB_WORKSPACE/go
-          export PATH=$PATH:$GOPATH
-          cd starport/interface/cli/starport
-          packr2 -v
-
       - name: Install Starport
         working-directory: ${{ env.working-directory }}
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,6 +14,5 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
-          stable: false
+          go-version: 1.16
       - run: ./scripts/test-unit 
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,6 @@
 build/
 dist
 nodetime-*
-packrd
-*-packr.go
 node_modules
 .DS_Store
 apps/
diff --git a/Makefile b/Makefile
@@ -21,11 +21,8 @@ build-static:
 	@go-bindata -pkg cosmosfaucet -prefix starport/pkg/cosmosfaucet -o starport/pkg/cosmosfaucet/openapi_generated.go starport/pkg/cosmosfaucet/openapi/...
 
 build: mod pre-build
-	@go get -u github.com/gobuffalo/packr/v2/packr2
-	@cd ./starport/interface/cli/starport && packr2
 	@mkdir -p build/
 	@go build $(BUILD_FLAGS) -o build/ ./starport/interface/cli/...
-	@packr2 clean
 	@go mod tidy
 
 clean:
diff --git a/docs/1 Introduction/2 Install.md b/docs/1 Introduction/2 Install.md
@@ -33,7 +33,8 @@ Starport uses [Git LFS](https://git-lfs.github.com/). Please make sure that it i
 If you have installed Git LFS after cloning Starport, checkout to your preferred branch to trigger a pull for large files or run `git lfs pull`.
 
 ```
-git clone https://github.com/tendermint/starport && cd starport && make
+git clone https://github.com/tendermint/starport --depth=1
+cd starport && make
 ```
 
 This will build and install `starport` binary into `$GOBIN`.
diff --git a/go.mod b/go.mod
@@ -18,7 +18,8 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-git/go-git/v5 v5.1.0
 	github.com/gobuffalo/genny v0.6.0
-	github.com/gobuffalo/packr/v2 v2.8.1
+	github.com/gobuffalo/packd v1.0.0
+	github.com/gobuffalo/packr/v2 v2.8.1 // indirect
 	github.com/gobuffalo/plush v3.8.3+incompatible
 	github.com/gobuffalo/plushgen v0.1.2
 	github.com/goccy/go-yaml v1.8.0
diff --git a/scripts/install b/scripts/install
@@ -24,11 +24,6 @@ rm -rf starport/ui/dist
     npm i >/dev/null && \
     npm run build >/dev/null)
 
-echo packing the ui...
-go get -u github.com/gobuffalo/packr/v2/packr2 >/dev/null
-(cd ./starport/interface/cli/starport && \
-    packr2)
-
 # gen statik dev ui.
 go get github.com/rakyll/statik
 statik -src=starport/ui/dist -dest=starport/ui/dist-go -ns starport:dev-ui -f 
diff --git a/starport/pkg/xgenny/xgenny.go b/starport/pkg/xgenny/xgenny.go
@@ -0,0 +1,59 @@
+package xgenny
+
+import (
+	"bytes"
+	"embed"
+	"path/filepath"
+	"strings"
+
+	"github.com/gobuffalo/packd"
+)
+
+// Walker implements packd.Walker for Go embed's fs.FS.
+type Walker struct {
+	fs         embed.FS
+	trimPrefix string
+}
+
+// NewEmbedWalker returns a new Walker for fs.
+// trimPrefix is used to trim parent paths from the paths of found files.
+func NewEmbedWalker(fs embed.FS, trimPrefix string) Walker {
+	return Walker{fs, trimPrefix}
+}
+
+// Walk implements packd.Walker.
+func (w Walker) Walk(wl packd.WalkFunc) error {
+	return w.walkDir(wl, ".")
+}
+
+func (w Walker) walkDir(wl packd.WalkFunc, path string) error {
+	entries, err := w.fs.ReadDir(path)
+	if err != nil {
+		return err
+	}
+
+	for _, entry := range entries {
+		if entry.IsDir() {
+			w.walkDir(wl, filepath.Join(path, entry.Name()))
+			continue
+		}
+
+		path := filepath.Join(path, entry.Name())
+
+		data, err := w.fs.ReadFile(path)
+		if err != nil {
+			return err
+		}
+
+		ppath := strings.TrimPrefix(path, w.trimPrefix)
+
+		f, err := packd.NewFile(ppath, bytes.NewReader(data))
+		if err != nil {
+			return err
+		}
+
+		wl(ppath, f)
+	}
+
+	return nil
+}
diff --git a/starport/services/chain/build.go b/starport/services/chain/build.go
@@ -15,7 +15,10 @@ import (
 	"github.com/tendermint/starport/starport/pkg/cosmosanalysis/module"
 	"github.com/tendermint/starport/starport/pkg/cosmosgen"
 	"github.com/tendermint/starport/starport/pkg/cosmosver"
+<<<<<<< HEAD
 	"github.com/tendermint/starport/starport/pkg/giturl"
+=======
+>>>>>>> develop
 	"github.com/tendermint/starport/starport/pkg/gocmd"
 	"github.com/tendermint/starport/starport/pkg/goenv"
 )
diff --git a/starport/templates/app/new.go b/starport/templates/app/new.go
@@ -1,21 +1,31 @@
 package app
 
 import (
+	"embed"
 	"strings"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packd"
 	"github.com/gobuffalo/plush"
 	"github.com/gobuffalo/plushgen"
 	"github.com/tendermint/starport/starport/pkg/cosmosver"
+	"github.com/tendermint/starport/starport/pkg/xgenny"
 )
 
-// these needs to be created in the compiler time, otherwise packr2 won't be
-// able to find boxes.
-var templates = map[cosmosver.MajorVersion]*packr.Box{
-	cosmosver.Launchpad: packr.New("app/templates/launchpad", "./launchpad"),
-	cosmosver.Stargate:  packr.New("app/templates/stargate", "./stargate"),
-}
+var (
+	//go:embed stargate/* stargate/**/*
+	fsStargate embed.FS
+
+	//go:embed launchpad/* launchpad/**/*
+	fsLaunchpad embed.FS
+
+	// these needs to be created in the compiler time, otherwise packr2 won't be
+	// able to find boxes.
+	templates = map[cosmosver.MajorVersion]packd.Walker{
+		cosmosver.Stargate:  xgenny.NewEmbedWalker(fsStargate, "stargate/"),
+		cosmosver.Launchpad: xgenny.NewEmbedWalker(fsLaunchpad, "launchpad/"),
+	}
+)
 
 // New ...
 func New(sdkVersion cosmosver.MajorVersion, opts *Options) (*genny.Generator, error) {
diff --git a/starport/templates/ibc/new_packet.go b/starport/templates/ibc/new_packet.go
@@ -1,22 +1,26 @@
 package ibc
 
 import (
+	"embed"
 	"fmt"
 
+	"github.com/tendermint/starport/starport/pkg/xgenny"
 	"github.com/tendermint/starport/starport/templates/module"
 
 	"github.com/tendermint/starport/starport/templates/typed"
 
 	"strings"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush"
 	"github.com/gobuffalo/plushgen"
 )
 
 var (
-	ibcTemplate = packr.New("ibc/templates/packet", "./packet")
+	//go:embed packet/* packet/**/*
+	fsPacket embed.FS
+
+	ibcTemplate = xgenny.NewEmbedWalker(fsPacket, "packet/")
 )
 
 // Options ...
diff --git a/starport/templates/module/create/templates.go b/starport/templates/module/create/templates.go
@@ -1,13 +1,24 @@
 package modulecreate
 
 import (
-	"github.com/gobuffalo/packr/v2"
+	"embed"
+
+	"github.com/tendermint/starport/starport/pkg/xgenny"
 )
 
 // these needs to be created in the compiler time, otherwise packr2 won't be
 // able to find boxes.
 var (
-	launchpadTemplate = packr.New("module/create/templates/launchpad", "./launchpad")
-	stargateTemplate  = packr.New("module/create/templates/stargate", "./stargate")
-	ibcTemplate       = packr.New("module/create/templates/ibc", "./ibc")
+	//go:embed launchpad/* launchpad/**/*
+	fsLaunchpad embed.FS
+
+	//go:embed stargate/* stargate/**/*
+	fsStargate embed.FS
+
+	//go:embed ibc/* ibc/**/*
+	fsIBC embed.FS
+
+	launchpadTemplate = xgenny.NewEmbedWalker(fsLaunchpad, "launchpad/")
+	stargateTemplate  = xgenny.NewEmbedWalker(fsStargate, "stargate/")
+	ibcTemplate       = xgenny.NewEmbedWalker(fsIBC, "ibc/")
 )
diff --git a/starport/templates/module/import/new_import_launchpad.go b/starport/templates/module/import/new_import_launchpad.go
@@ -7,7 +7,6 @@ import (
 	"github.com/tendermint/starport/starport/templates/module"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush"
 	"github.com/gobuffalo/plushgen"
 )
@@ -18,9 +17,6 @@ func NewImportLaunchpad(opts *ImportOptions) (*genny.Generator, error) {
 	g.RunFn(appModifyLaunchpad(opts))
 	g.RunFn(exportModifyLaunchpad(opts))
 	g.RunFn(cmdMainModifyLaunchpad(opts))
-	if err := g.Box(packr.New("wasm", "./wasm")); err != nil {
-		return g, err
-	}
 	ctx := plush.NewContext()
 	ctx.Set("AppName", opts.AppName)
 	ctx.Set("title", strings.Title)
diff --git a/starport/templates/module/import/new_import_stargate.go b/starport/templates/module/import/new_import_stargate.go
diff --git a/starport/templates/typed/indexed/new_stargate.go b/starport/templates/typed/indexed/new_stargate.go
diff --git a/starport/templates/typed/typed.go b/starport/templates/typed/typed.go
