certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change deps to master. remove tmwire dep

This commit is contained in:
Ethan Buchman 2018-03-03 21:00:28 -05:00 committed by rigelrozanski
parent e3c68e2640
commit 9dc3690a0c
5 changed files with 96 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
Gopkg.lock generated
View File

@ -1,6 +1,18 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
name = "github.com/alecthomas/gometalinter"
packages = ["."]
revision = "46cc1ea3778b247666c2949669a3333c532fa9c6"
version = "v2.0.5"
[[projects]]
branch = "master"
name = "github.com/alecthomas/units"
packages = ["."]
revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
[[projects]]
name = "github.com/bgentry/speakeasy"
packages = ["."]
@ -8,9 +20,10 @@
version = "v0.1.0"
[[projects]]
branch = "master"
name = "github.com/btcsuite/btcd"
packages = ["btcec"]
revision = "50de9da05b50eb15658bb350f6ea24368a111ab7"
revision = "2be2f12b358dc57d70b8f501b00be450192efbc3"
[[projects]]
name = "github.com/davecgh/go-spew"
@ -83,6 +96,12 @@
packages = ["."]
revision = "553a641470496b2327abcac10b36396bd98e45c9"
[[projects]]
branch = "master"
name = "github.com/google/shlex"
packages = ["."]
revision = "6f45313302b9c56850fc17f99e40caebce98c716"
[[projects]]
name = "github.com/gorilla/websocket"
packages = ["."]
@ -132,7 +151,8 @@
[[projects]]
name = "github.com/magiconair/properties"
packages = ["."]
revision = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
version = "v1.7.6"
[[projects]]
name = "github.com/mattn/go-isatty"
@ -141,9 +161,21 @@
version = "v0.0.3"
[[projects]]
branch = "master"
name = "github.com/mitchellh/mapstructure"
packages = ["."]
revision = "b4575eea38cca1123ec2dc90c26529b5c5acfcff"
revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
[[projects]]
name = "github.com/nicksnyder/go-i18n"
packages = [
"i18n",
"i18n/bundle",
"i18n/language",
"i18n/translation"
]
revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
version = "v1.10.0"
[[projects]]
name = "github.com/pelletier/go-toml"
@ -169,12 +201,6 @@
packages = ["."]
revision = "8732c616f52954686704c8645fe1a9d59e9df7c1"
[[projects]]
branch = "master"
name = "github.com/rigelrozanski/common"
packages = ["."]
revision = "f691f115798593d783b9999b1263c2f4ffecc439"
[[projects]]
name = "github.com/spf13/afero"
packages = [
@ -187,8 +213,8 @@
[[projects]]
name = "github.com/spf13/cast"
packages = ["."]
revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
version = "v1.1.0"
revision = "8965335b8c7107321228e3e3702cab9832751bac"
version = "v1.2.0"
[[projects]]
name = "github.com/spf13/cobra"
@ -224,6 +250,7 @@
version = "v1.2.1"
[[projects]]
branch = "master"
name = "github.com/syndtr/goleveldb"
packages = [
"leveldb",
@ -239,10 +266,10 @@
"leveldb/table",
"leveldb/util"
]
revision = "34011bf325bce385408353a30b101fe5e923eb6e"
revision = "c7a14d4b00e222eab6111b4cd1af829c13f53ec2"
[[projects]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/abci"
packages = [
"client",
@ -251,7 +278,7 @@
"server",
"types"
]
revision = "c960c5275617ef141c92c3d7fc65a396c97662df"
revision = "c015e7a23dfb7f6004d3e4ff03a49fd5cf1f18f3"
[[projects]]
branch = "master"
@ -264,7 +291,6 @@
revision = "d8387025d2b9d158cf4efb07e7ebf814bcce2057"
[[projects]]
branch = "develop"
name = "github.com/tendermint/go-crypto"
packages = [
".",
@ -273,22 +299,25 @@
"keys/words",
"keys/words/wordlist"
]
revision = "4fc3055dbd17aa1203d0abc64b9293f378da22ec"
revision = "c3e19f3ea26f5c3357e0bcbb799b0761ef923755"
version = "v0.5.0"
[[projects]]
branch = "develop"
name = "github.com/tendermint/go-wire"
packages = ["."]
revision = "5d7845f24b843c914cf571dad2ca13c91cf70f0d"
packages = [
".",
"data"
]
revision = "fa721242b042ecd4c6ed1a934ee740db4f74e45c"
version = "v0.7.3"
[[projects]]
branch = "develop"
name = "github.com/tendermint/iavl"
packages = ["."]
revision = "1a59ec0c82dc940c25339dd7c834df5cb76a95cb"
revision = "669ff61054a14c4542dbd657ab438800d5630e45"
version = "v0.6.1"
[[projects]]
branch = "breaking/wire-sdk2"
name = "github.com/tendermint/tendermint"
packages = [
"blockchain",
@ -323,13 +352,12 @@
"state/txindex/kv",
"state/txindex/null",
"types",
"version",
"wire"
"version"
]
revision = "c330b9e43c93351a5c3040333d7d0c7c27859a20"
revision = "c8a2bdf78ba7aaaf4284fa78c1b9b05c5e7342bc"
version = "v0.16.0"
[[projects]]
branch = "develop"
name = "github.com/tendermint/tmlibs"
packages = [
"autofile",
@ -344,9 +372,11 @@
"pubsub",
"pubsub/query"
]
revision = "a0f652dc2e131be86fc8d9e4e2beec9831a8a6ec"
revision = "1b9b5652a199ab0be2e781393fb275b66377309d"
version = "v0.7.0"
[[projects]]
branch = "master"
name = "golang.org/x/crypto"
packages = [
"blowfish",
@ -359,9 +389,10 @@
"ripemd160",
"salsa20/salsa"
]
revision = "1875d0a70c90e57f11972aefd42276df65e895b9"
revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab"
[[projects]]
branch = "master"
name = "golang.org/x/net"
packages = [
"context",
@ -372,12 +403,13 @@
"lex/httplex",
"trace"
]
revision = "2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1"
revision = "22ae77b79946ea320088417e4d50825671d82d57"
[[projects]]
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
revision = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9"
[[projects]]
name = "golang.org/x/text"
@ -397,21 +429,27 @@
"unicode/norm",
"unicode/rangetable"
]
revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3"
revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
version = "v0.3.0"
[[projects]]
branch = "master"
name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"]
revision = "4eb30f4778eed4c258ba66527a0d4f9ec8a36c45"
revision = "2c5e7ac708aaa719366570dd82bda44541ca2a63"
[[projects]]
name = "google.golang.org/grpc"
packages = [
".",
"balancer",
"balancer/base",
"balancer/roundrobin",
"codes",
"connectivity",
"credentials",
"encoding",
"encoding/proto",
"grpclb/grpc_lb_v1/messages",
"grpclog",
"internal",
@ -420,23 +458,31 @@
"naming",
"peer",
"resolver",
"resolver/dns",
"resolver/passthrough",
"stats",
"status",
"tap",
"transport"
]
revision = "401e0e00e4bb830a10496d64cd95e068c5bf50de"
version = "v1.7.3"
revision = "8e4536a86ab602859c20df5ebfd0bd4228d08655"
version = "v1.10.0"
[[projects]]
branch = "v3-unstable"
name = "gopkg.in/alecthomas/kingpin.v3-unstable"
packages = ["."]
revision = "b8d601de6db1f3b56a99ffe9051eb708574bc1cd"
[[projects]]
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
version = "v2.0.0"
revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
version = "v2.1.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "6809513d36f723a32757edb501a56fb86e3318af871c77fd65891d11d39437f1"
inputs-digest = "6216c6050ed92cf576681bc92b41c491e359cbd8fef9e14cb36ef90ce9e2f16d"
solver-name = "gps-cdcl"
solver-version = 1

14
Gopkg.toml
View File

@ -58,27 +58,27 @@
version = "1.2.1"
[[constraint]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/abci"
[[constraint]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/go-crypto"
[[constraint]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/go-wire"
[[constraint]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/iavl"
[[constraint]]
branch = "breaking/wire-sdk2"
[[override]]
branch = "master"
name = "github.com/tendermint/tendermint"
[[constraint]]
branch = "develop"
branch = "master"
name = "github.com/tendermint/tmlibs"
[prune]

4
client/rpc/block.go
View File

@ -5,9 +5,9 @@ import (
"strconv"
"github.com/spf13/cobra"
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
tmwire "github.com/tendermint/tendermint/wire"
)
const (
@ -56,7 +56,7 @@ func getBlock(cmd *cobra.Command, args []string) error {
return err
}
output, err := tmwire.MarshalJSON(res)
output, err := wire.MarshalJSON(res)
// output, err := json.MarshalIndent(res, " ", "")
if err != nil {
return err

4
client/rpc/status.go
View File

@ -4,9 +4,9 @@ import (
"fmt"
"github.com/spf13/cobra"
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
tmwire "github.com/tendermint/tendermint/wire"
)
func statusCommand() *cobra.Command {
@ -30,7 +30,7 @@ func checkStatus(cmd *cobra.Command, args []string) error {
return err
}
output, err := tmwire.MarshalJSON(res)
output, err := wire.MarshalJSON(res)
// output, err := json.MarshalIndent(res, " ", "")
if err != nil {
return err

4
client/rpc/validators.go
View File

@ -5,9 +5,9 @@ import (
"strconv"
"github.com/spf13/cobra"
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
tmwire "github.com/tendermint/tendermint/wire"
)
func validatorCommand() *cobra.Command {
@ -47,7 +47,7 @@ func getValidators(cmd *cobra.Command, args []string) error {
return err
}
output, err := tmwire.MarshalJSON(res)
output, err := wire.MarshalJSON(res)
// output, err := json.MarshalIndent(res, " ", "")
if err != nil {
return err