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

fix acceptDeadline

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

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.

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
 )