Skip to content

Commit

Permalink
Merge pull request CosmosContracts#154 from CosmosContracts/faddat/ma…
Browse files Browse the repository at this point in the history
…intain-spm

maitenance for the starport modules in Juno
  • Loading branch information
faddat authored Mar 10, 2022
2 parents 78492a6 + 0bb73fd commit ca0225a
Show file tree
Hide file tree
Showing 9 changed files with 511 additions and 18 deletions.
4 changes: 2 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/spf13/cast"
"github.com/tendermint/spm/openapiconsole"
"github.com/tendermint/starport/starport/pkg/openapiconsole"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmos "github.com/tendermint/tendermint/libs/os"
Expand Down Expand Up @@ -100,7 +100,7 @@ import (

// this line is used by starport scaffolding # stargate/app/moduleImport

"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/junod/genwasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/CosmosContracts/juno/app"
"github.com/cosmos/cosmos-sdk/client"
"github.com/spf13/cobra"
"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"

"github.com/CosmWasm/wasmd/x/wasm"
wasmcli "github.com/CosmWasm/wasmd/x/wasm/client/cli"
Expand Down
2 changes: 1 addition & 1 deletion cmd/junod/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/CosmosContracts/juno/app"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"
tmcmds "github.com/tendermint/tendermint/cmd/tendermint/commands"
"github.com/tendermint/spm/cosmoscmd"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/spf13/cast v1.4.1
github.com/spf13/cobra v1.3.0
github.com/stretchr/testify v1.7.0
github.com/tendermint/spm v0.1.8
github.com/tendermint/starport v0.19.3
github.com/tendermint/tendermint v0.34.16
github.com/tendermint/tm-db v0.6.7
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
Expand Down Expand Up @@ -50,7 +50,7 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
github.com/dgraph-io/ristretto v0.0.3 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
Expand Down Expand Up @@ -82,7 +82,7 @@ require (
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand Down Expand Up @@ -115,7 +115,7 @@ require (
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect
golang.org/x/net v0.0.0-20211208012354-db4efeb81f4b // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
Expand Down
504 changes: 499 additions & 5 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion testutil/network/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/network"
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"
tmrand "github.com/tendermint/tendermint/libs/rand"
tmdb "github.com/tendermint/tm-db"

Expand Down
3 changes: 1 addition & 2 deletions testutil/simapp/simapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"github.com/cosmos/cosmos-sdk/simapp"
"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand All @@ -18,7 +18,6 @@ import (
func New(dir string) cosmoscmd.App {
db := tmdb.NewMemDB()
logger := log.NewNopLogger()


encoding := cosmoscmd.MakeEncodingConfig(app.ModuleBasics)

Expand Down
2 changes: 1 addition & 1 deletion x/mint/keeper/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
"encoding/json"

"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
Expand Down
2 changes: 1 addition & 1 deletion x/mint/simulation/decoder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/tendermint/spm/cosmoscmd"
"github.com/tendermint/starport/starport/pkg/cosmoscmd"

"github.com/CosmosContracts/juno/app"
"github.com/CosmosContracts/juno/x/mint/simulation"
Expand Down

0 comments on commit ca0225a

Please sign in to comment.