diff --git a/Gopkg.lock b/Gopkg.lock index ec3d458e5d..ff4e21c1c7 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -342,8 +342,8 @@ "types/priv_validator", "version" ] - revision = "02531ca5a3a3d521e33bffa528583ff5b78d0594" - version = "0.19.0-rc1" + revision = "7afe74a963b5222bbc063545f4a9261d27b188de" + version = "0.19.0-rc2" [[projects]] name = "github.com/tendermint/tmlibs" @@ -459,6 +459,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "14adc8fa3c1dd74dc5245e876158600265f86051b6d03f08f8a2d9f26dc347c2" + inputs-digest = "ad719da6da7632d7fd405a696e66e36d5616142a499358189d88312dc1946d34" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index b3517e9701..2570c08856 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -70,7 +70,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "0.19.0-rc1" + version = "0.19.0-rc2" [[override]] name = "github.com/tendermint/tmlibs" diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go index 585d1570ed..7fcbb02b94 100644 --- a/client/lcd/lcd_test.go +++ b/client/lcd/lcd_test.go @@ -340,7 +340,7 @@ func startTMAndLCD() (*nm.Node, net.Listener, error) { config.Consensus.SkipTimeoutCommit = false logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) - logger = log.NewFilter(logger, log.AllowError()) + // logger = log.NewFilter(logger, log.AllowError()) privValidatorFile := config.PrivValidatorFile() privVal := pvm.LoadOrGenFilePV(privValidatorFile) dbs := map[string]dbm.DB{ @@ -374,6 +374,7 @@ func startTMAndLCD() (*nm.Node, net.Listener, error) { genDoc.AppState = stateBytes cdc := wire.NewCodec() + wire.RegisterCrypto(cdc) // LCD listen address port = fmt.Sprintf("%d", 17377) // XXX @@ -392,7 +393,7 @@ func startTMAndLCD() (*nm.Node, net.Listener, error) { return nil, nil, err } - waitForStart() + waitForStart(cdc) return node, lcd, nil } @@ -533,7 +534,7 @@ func waitForHeight(height int64) { } // wait for 2 blocks -func waitForStart() { +func waitForStart(cdc *wire.Codec) { waitHeight := int64(2) for { time.Sleep(time.Second) @@ -558,7 +559,7 @@ func waitForStart() { } res.Body.Close() - err = json.Unmarshal([]byte(body), &resultBlock) + err = cdc.UnmarshalJSON([]byte(body), &resultBlock) if err != nil { fmt.Println("RES", res) fmt.Println("BODY", string(body))