fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-14 22:01:20 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
fix acceptDeadline
This commit is contained in:
Alexander Simmerl
2018-07-24 15:52:45 +02:00
committed by GitHub
parent 7e7473ad41 ad580e2734
commit abe5b63059
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

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

4
CHANGELOG_PENDING.md
View File

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

6
privval/socket.go
View File

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