Merge tag 'v1.2.5-internal'

go.mod

@@ -1,25 +1,34 @@
 module github.com/medibloc/panacea-core
 
-go 1.13
+go 1.14
 
 replace golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
 
 require (
-	github.com/bombsimon/wsl v1.2.1 // indirect
 	github.com/btcsuite/btcutil v1.0.2
 	github.com/cosmos/cosmos-sdk v0.34.7
 	github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8
-	github.com/golangci/golangci-lint v1.22.2 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/golangci/golangci-lint v1.24.0 // indirect
 	github.com/gorilla/mux v1.7.0
+	github.com/mattn/go-isatty v0.0.8 // indirect
+	github.com/onsi/ginkgo v1.11.0 // indirect
+	github.com/onsi/gomega v1.8.1 // indirect
 	github.com/pborman/uuid v1.2.1
-	github.com/rakyll/statik v0.1.6
+	github.com/rakyll/statik v0.1.7
 	github.com/spf13/cobra v0.0.5
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.6.1
 	github.com/stretchr/testify v1.4.0
 	github.com/tendermint/go-amino v0.15.0
-	github.com/tendermint/tendermint v0.31.9
+	github.com/tendermint/tendermint v0.31.12
 	golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d
-	golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
+	golang.org/x/net v0.0.0-20190923162816-aa69164e4478 // indirect
+	golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 // indirect
+	golang.org/x/text v0.3.2 // indirect
+	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v2 v2.2.7 // indirect
 )
 
-replace github.com/cosmos/cosmos-sdk => github.com/medibloc/cosmos-sdk v0.35.3
+replace github.com/cosmos/cosmos-sdk => github.com/medibloc/cosmos-sdk v0.35.6-internal

x/did/client/cli/tx_test.go

@@ -3,6 +3,8 @@ package cli
 import (
 	"bufio"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/spf13/viper"
 	"os"
 	"strings"
 	"testing"
@@ -115,6 +117,7 @@ func TestSaveAndGetPrivKeyFromKeyStore(t *testing.T) {
 }
 
 func getCliContext(t *testing.T) context.CLIContext {
+	viper.Set(client.FlagTrustNode, true)
 	fromAddr, err := sdk.AccAddressFromBech32("panacea154p6kyu9kqgvcmq63w3vpn893ssy6anpu8ykfq")
 	require.NoError(t, err)
 	return context.NewCLIContext().WithFromAddress(fromAddr)