From ad580e2734de2b417a6731fb46dfb3a61a09a375 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 24 Jul 2018 10:44:39 +0400 Subject: [PATCH] fix acceptDeadline before: 1.000000003s after: 3.000000000s Refs #2027 --- CHANGELOG.md | 4 +--- CHANGELOG_PENDING.md | 4 ++++ privval/socket.go | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d5656b7..44a242340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index c51a2ab6f..596cf22d7 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -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. diff --git a/privval/socket.go b/privval/socket.go index c33443eda..d5ede471c 100644 --- a/privval/socket.go +++ b/privval/socket.go @@ -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 )