From ee0740a289cab383ef786e7105965fdf20dbf1f7 Mon Sep 17 00:00:00 2001
From: "Johan T. Halseth" <johanth@gmail.com>
Date: Tue, 24 Jul 2018 13:10:28 +0200
Subject: [PATCH] peer test: set TrickleTimeout for test configs

---
 peer/example_test.go | 2 ++
 peer/peer_test.go    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/peer/example_test.go b/peer/example_test.go
index e4429f85..5c4b570d 100644
--- a/peer/example_test.go
+++ b/peer/example_test.go
@@ -23,6 +23,7 @@ func mockRemotePeer() error {
 		UserAgentName:    "peer",  // User agent name to advertise.
 		UserAgentVersion: "1.0.0", // User agent version to advertise.
 		ChainParams:      &chaincfg.SimNetParams,
+		TrickleTimeout:   time.Second * 10,
 	}
 
 	// Accept connections on the simnet port.
@@ -69,6 +70,7 @@ func Example_newOutboundPeer() {
 		UserAgentVersion: "1.0.0", // User agent version to advertise.
 		ChainParams:      &chaincfg.SimNetParams,
 		Services:         0,
+		TrickleTimeout:   time.Second * 10,
 		Listeners: peer.MessageListeners{
 			OnVersion: func(p *peer.Peer, msg *wire.MsgVersion) {
 				fmt.Println("outbound: received version")
diff --git a/peer/peer_test.go b/peer/peer_test.go
index 34ab1144..e87d2f95 100644
--- a/peer/peer_test.go
+++ b/peer/peer_test.go
@@ -236,6 +236,7 @@ func TestPeerConnection(t *testing.T) {
 		ChainParams:       &chaincfg.MainNetParams,
 		ProtocolVersion:   wire.RejectVersion, // Configure with older version
 		Services:          0,
+		TrickleTimeout:    time.Second * 10,
 	}
 	peer2Cfg := &peer.Config{
 		Listeners:         peer1Cfg.Listeners,
@@ -244,6 +245,7 @@ func TestPeerConnection(t *testing.T) {
 		UserAgentComments: []string{"comment"},
 		ChainParams:       &chaincfg.MainNetParams,
 		Services:          wire.SFNodeNetwork | wire.SFNodeWitness,
+		TrickleTimeout:    time.Second * 10,
 	}
 
 	wantStats1 := peerStats{
@@ -447,6 +449,7 @@ func TestPeerListeners(t *testing.T) {
 		UserAgentComments: []string{"comment"},
 		ChainParams:       &chaincfg.MainNetParams,
 		Services:          wire.SFNodeBloom,
+		TrickleTimeout:    time.Second * 10,
 	}
 	inConn, outConn := pipe(
 		&conn{raddr: "10.0.0.1:8333"},
@@ -617,6 +620,7 @@ func TestOutboundPeer(t *testing.T) {
 		UserAgentComments: []string{"comment"},
 		ChainParams:       &chaincfg.MainNetParams,
 		Services:          0,
+		TrickleTimeout:    time.Second * 10,
 	}
 
 	r, w := io.Pipe()
@@ -757,6 +761,7 @@ func TestUnsupportedVersionPeer(t *testing.T) {
 		UserAgentComments: []string{"comment"},
 		ChainParams:       &chaincfg.MainNetParams,
 		Services:          0,
+		TrickleTimeout:    time.Second * 10,
 	}
 
 	localNA := wire.NewNetAddressIPPort(