From bf17e1b020d251dcd053079e257b742c36775d19 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Wed, 3 Apr 2019 09:03:21 -0400 Subject: [PATCH] Merge PR #4029: Update Tendermint to v0.31.3 --- .../breaking/tendermint/4001-Upgrade-Tendermint-to-v0-31-1 | 1 - .../breaking/tendermint/4029-Upgrade-Tendermint-to-v0-31-3 | 1 + client/keys/show_test.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 .pending/breaking/tendermint/4001-Upgrade-Tendermint-to-v0-31-1 create mode 100644 .pending/breaking/tendermint/4029-Upgrade-Tendermint-to-v0-31-3 diff --git a/.pending/breaking/tendermint/4001-Upgrade-Tendermint-to-v0-31-1 b/.pending/breaking/tendermint/4001-Upgrade-Tendermint-to-v0-31-1 deleted file mode 100644 index 18e2dbcb0..000000000 --- a/.pending/breaking/tendermint/4001-Upgrade-Tendermint-to-v0-31-1 +++ /dev/null @@ -1 +0,0 @@ -#4001 Upgrade Tendermint to v0.31.1 diff --git a/.pending/breaking/tendermint/4029-Upgrade-Tendermint-to-v0-31-3 b/.pending/breaking/tendermint/4029-Upgrade-Tendermint-to-v0-31-3 new file mode 100644 index 000000000..fd5901908 --- /dev/null +++ b/.pending/breaking/tendermint/4029-Upgrade-Tendermint-to-v0-31-3 @@ -0,0 +1 @@ +#4029 Upgrade Tendermint to v0.31.3 diff --git a/client/keys/show_test.go b/client/keys/show_test.go index f12efb7c5..05dd0de56 100644 --- a/client/keys/show_test.go +++ b/client/keys/show_test.go @@ -23,8 +23,8 @@ func Test_multiSigKey_Properties(t *testing.T) { assert.Equal(t, "myMultisig", tmp.GetName()) assert.Equal(t, keys.TypeMulti, tmp.GetType()) - assert.Equal(t, "79BF2B5B418A85329EC2149D1854D443F56F5A9F", tmp.GetPubKey().Address().String()) - assert.Equal(t, "cosmos10xljkk6p32zn98kzzjw3s4x5g06k7k5lz6flcv", tmp.GetAddress().String()) + assert.Equal(t, "D3923267FA8A3DD367BB768FA8BDC8FF7F89DA3F", tmp.GetPubKey().Address().String()) + assert.Equal(t, "cosmos16wfryel63g7axeamw68630wglalcnk3l0zuadc", tmp.GetAddress().String()) } func Test_showKeysCmd(t *testing.T) { diff --git a/go.mod b/go.mod index 72cf45356..faa47726d 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/tendermint/btcd v0.1.1 github.com/tendermint/go-amino v0.14.1 github.com/tendermint/iavl v0.12.1 - github.com/tendermint/tendermint v0.31.1 + github.com/tendermint/tendermint v0.31.3 github.com/zondax/hid v0.9.0 // indirect golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 google.golang.org/grpc v1.19.0 // indirect diff --git a/go.sum b/go.sum index f8dc9bc8b..fea25091b 100644 --- a/go.sum +++ b/go.sum @@ -146,8 +146,8 @@ github.com/tendermint/go-amino v0.14.1 h1:o2WudxNfdLNBwMyl2dqOJxiro5rfrEaU0Ugs6o github.com/tendermint/go-amino v0.14.1/go.mod h1:i/UKE5Uocn+argJJBb12qTZsCDBcAYMbR92AaJVmKso= github.com/tendermint/iavl v0.12.1 h1:JDfyhM/Hhrumu1CL1Nxrypm8sNTPYqmeHo1IZLiJoXM= github.com/tendermint/iavl v0.12.1/go.mod h1:EoKMMv++tDOL5qKKVnoIqtVPshRrEPeJ0WsgDOLAauM= -github.com/tendermint/tendermint v0.31.1 h1:1O2kb95A3dAU2ijzz6Dpweo9jv+mWjKHsLGC+ujKTZw= -github.com/tendermint/tendermint v0.31.1/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc= +github.com/tendermint/tendermint v0.31.3 h1:IlehDNREaGdt/VVZTjs978R/lhmnIf4NOH3j+ZhhbZA= +github.com/tendermint/tendermint v0.31.3/go.mod h1:ymcPyWblXCplCPQjbOYbrF1fWnpslATMVqiGgWbZrlc= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=