Browse Source

Merge pull request #2040 from tendermint/2027-socket-pv

fix acceptDeadline
pull/2059/head
Alexander Simmerl 6 years ago
committed by GitHub
parent
commit
abe5b63059
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
  1. +1
    -3
      CHANGELOG.md
  2. +4
    -0
      CHANGELOG_PENDING.md
  3. +3
    -3
      privval/socket.go

+ 1
- 3
CHANGELOG.md View File

@ -1,7 +1,5 @@
# Changelog
## TBA
## 0.22.5
*July 23th, 2018*
@ -15,7 +13,7 @@ IMPROVEMENTS:
- [config] Increase default send/recv rates to 5 mB/s
- [p2p] allow persistent peers to be private
BUG FIXES
BUG FIXES:
- [mempool] fixed a race condition when `create_empty_blocks=false` where a
transaction is published at an old height.
- [p2p] dial external IP setup by `persistent_peers`, not internal NAT IP


+ 4
- 0
CHANGELOG_PENDING.md View File

@ -8,3 +8,7 @@ IMPROVEMENTS:
- [blockchain] Improve fast-sync logic
- tweak params
- only process one block at a time to avoid starving
BUG FIXES:
- [privval] fix a deadline for accepting new connections in socket private
validator.

+ 3
- 3
privval/socket.go View File

@ -7,12 +7,12 @@ import (
"net"
"time"
"github.com/tendermint/go-amino"
amino "github.com/tendermint/go-amino"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/ed25519"
cmn "github.com/tendermint/tendermint/libs/common"
"github.com/tendermint/tendermint/libs/log"
p2pconn "github.com/tendermint/tendermint/p2p/conn"
"github.com/tendermint/tendermint/types"
)
@ -33,7 +33,7 @@ var (
)
var (
acceptDeadline = time.Second + defaultAcceptDeadlineSeconds
acceptDeadline = time.Second * defaultAcceptDeadlineSeconds
connDeadline = time.Second * defaultConnDeadlineSeconds
connHeartbeat = time.Second * defaultConnHeartBeatSeconds
)


Loading…
Cancel
Save