Browse Source

add missing changelog entries (#2224)

pull/2235/head
Anton Kaliaev 6 years ago
committed by Ethan Buchman
parent
commit
eb98f1c3a9
4 changed files with 19 additions and 19 deletions
  1. +4
    -2
      CHANGELOG_PENDING.md
  2. +11
    -13
      scripts/json2wal/main.go
  3. +1
    -1
      scripts/wal2json/main.go
  4. +3
    -3
      types/genesis_test.go

+ 4
- 2
CHANGELOG_PENDING.md View File

@ -10,15 +10,17 @@ BREAKING CHANGES:
- [abci] Added address of the original proposer of the block to Header.
- [abci] Change ABCI Header to match Tendermint exactly
- [libs] Remove cmn.Fmt, in favor of fmt.Sprintf
- [blockchain] fix go-amino routes for blockchain messages
- [crypto] Rename AminoRoute variables to no longer be prefixed by signature type.
- [config] Replace MaxNumPeers with MaxNumInboundPeers and MaxNumOutboundPeers
FEATURES:
- [types] allow genesis file to have 0 validators ([#2015](https://github.com/tendermint/tendermint/issues/2015))
IMPROVEMENTS:
- [scripts] Added json2wal tool, which is supposed to help our users restore
corrupted WAL files and compose test WAL files (@bradyjoestar)
BUG FIXES:
- [mempool] No longer possible to fill up linked list without getting caching
benefits [#2180](https://github.com/tendermint/tendermint/issues/2180)
- [mempool] No longer possible to fill up linked list without getting caching
benefits [#2180](https://github.com/tendermint/tendermint/issues/2180)

+ 11
- 13
scripts/json2wal/main.go View File

@ -8,13 +8,13 @@
package main
import (
"bufio"
"fmt"
"github.com/tendermint/go-amino"
"github.com/tendermint/tendermint/types"
cs "github.com/tendermint/tendermint/consensus"
"fmt"
"os"
"github.com/tendermint/tendermint/types"
"io"
"bufio"
"os"
"strings"
)
@ -26,7 +26,6 @@ func init() {
types.RegisterBlockAmino(cdc)
}
func main() {
if len(os.Args) < 3 {
fmt.Fprintln(os.Stderr, "missing arguments: Usage:json2wal <path-to-JSON> <path-to-wal>")
@ -39,7 +38,7 @@ func main() {
}
defer f.Close()
walFile, err := os.OpenFile(os.Args[2],os.O_EXCL|os.O_WRONLY|os.O_CREATE,0666)
walFile, err := os.OpenFile(os.Args[2], os.O_EXCL|os.O_WRONLY|os.O_CREATE, 0666)
if err != nil {
panic(fmt.Errorf("failed to open WAL file: %v", err))
}
@ -50,26 +49,25 @@ func main() {
for {
msgJson, _, err := br.ReadLine()
if err == io.EOF{
if err == io.EOF {
break
}else if err != nil {
} else if err != nil {
panic(fmt.Errorf("failed to read file: %v", err))
}
// ignore the ENDHEIGHT in json.File
if strings.HasPrefix(string(msgJson),"ENDHEIGHT"){
if strings.HasPrefix(string(msgJson), "ENDHEIGHT") {
continue
}
var msg cs.TimedWALMessage
err = cdc.UnmarshalJSON(msgJson,&msg)
if err != nil{
err = cdc.UnmarshalJSON(msgJson, &msg)
if err != nil {
panic(fmt.Errorf("failed to unmarshal json: %v", err))
}
err = dec.Encode(&msg)
if err != nil{
if err != nil {
panic(fmt.Errorf("failed to encode msg: %v", err))
}
}
}

+ 1
- 1
scripts/wal2json/main.go View File

@ -12,8 +12,8 @@ import (
"io"
"os"
cs "github.com/tendermint/tendermint/consensus"
"github.com/tendermint/go-amino"
cs "github.com/tendermint/tendermint/consensus"
"github.com/tendermint/tendermint/types"
)


+ 3
- 3
types/genesis_test.go View File

@ -64,10 +64,10 @@ func TestGenesisGood(t *testing.T) {
// Genesis doc from raw json
missingValidatorsTestCases := [][]byte{
[]byte(`{"chain_id":"mychain"}`), // missing validators
[]byte(`{"chain_id":"mychain","validators":[]}`), // missing validators
[]byte(`{"chain_id":"mychain"}`), // missing validators
[]byte(`{"chain_id":"mychain","validators":[]}`), // missing validators
[]byte(`{"chain_id":"mychain","validators":null}`), // nil validator
[]byte(`{"chain_id":"mychain"}`), // missing validators
[]byte(`{"chain_id":"mychain"}`), // missing validators
}
for _, tc := range missingValidatorsTestCases {


Loading…
Cancel
Save