From 28b20cff4b76595b695f9d784c98d50d31bb269b Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 22 Feb 2018 11:37:57 +0100
Subject: [PATCH] p2p/protocols: gofmt -w -s

---
 p2p/protocols/protocol_test.go | 44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go
index b041a650a..053f537a6 100644
--- a/p2p/protocols/protocol_test.go
+++ b/p2p/protocols/protocol_test.go
@@ -147,18 +147,18 @@ func protocolTester(t *testing.T, pp *p2ptest.TestPeerPool) *p2ptest.ProtocolTes
 func protoHandshakeExchange(id discover.NodeID, proto *protoHandshake) []p2ptest.Exchange {
 
 	return []p2ptest.Exchange{
-		p2ptest.Exchange{
+		{
 			Expects: []p2ptest.Expect{
-				p2ptest.Expect{
+				{
 					Code: 0,
 					Msg:  &protoHandshake{42, "420"},
 					Peer: id,
 				},
 			},
 		},
-		p2ptest.Exchange{
+		{
 			Triggers: []p2ptest.Trigger{
-				p2ptest.Trigger{
+				{
 					Code: 0,
 					Msg:  proto,
 					Peer: id,
@@ -200,18 +200,18 @@ func TestProtoHandshakeSuccess(t *testing.T) {
 func moduleHandshakeExchange(id discover.NodeID, resp uint) []p2ptest.Exchange {
 
 	return []p2ptest.Exchange{
-		p2ptest.Exchange{
+		{
 			Expects: []p2ptest.Expect{
-				p2ptest.Expect{
+				{
 					Code: 1,
 					Msg:  &hs0{42},
 					Peer: id,
 				},
 			},
 		},
-		p2ptest.Exchange{
+		{
 			Triggers: []p2ptest.Trigger{
-				p2ptest.Trigger{
+				{
 					Code: 1,
 					Msg:  &hs0{resp},
 					Peer: id,
@@ -252,42 +252,42 @@ func TestModuleHandshakeSuccess(t *testing.T) {
 func testMultiPeerSetup(a, b discover.NodeID) []p2ptest.Exchange {
 
 	return []p2ptest.Exchange{
-		p2ptest.Exchange{
+		{
 			Label: "primary handshake",
 			Expects: []p2ptest.Expect{
-				p2ptest.Expect{
+				{
 					Code: 0,
 					Msg:  &protoHandshake{42, "420"},
 					Peer: a,
 				},
-				p2ptest.Expect{
+				{
 					Code: 0,
 					Msg:  &protoHandshake{42, "420"},
 					Peer: b,
 				},
 			},
 		},
-		p2ptest.Exchange{
+		{
 			Label: "module handshake",
 			Triggers: []p2ptest.Trigger{
-				p2ptest.Trigger{
+				{
 					Code: 0,
 					Msg:  &protoHandshake{42, "420"},
 					Peer: a,
 				},
-				p2ptest.Trigger{
+				{
 					Code: 0,
 					Msg:  &protoHandshake{42, "420"},
 					Peer: b,
 				},
 			},
 			Expects: []p2ptest.Expect{
-				p2ptest.Expect{
+				{
 					Code: 1,
 					Msg:  &hs0{42},
 					Peer: a,
 				},
-				p2ptest.Expect{
+				{
 					Code: 1,
 					Msg:  &hs0{42},
 					Peer: b,
@@ -295,10 +295,10 @@ func testMultiPeerSetup(a, b discover.NodeID) []p2ptest.Exchange {
 			},
 		},
 
-		p2ptest.Exchange{Label: "alternative module handshake", Triggers: []p2ptest.Trigger{p2ptest.Trigger{Code: 1, Msg: &hs0{41}, Peer: a},
-			p2ptest.Trigger{Code: 1, Msg: &hs0{41}, Peer: b}}},
-		p2ptest.Exchange{Label: "repeated module handshake", Triggers: []p2ptest.Trigger{p2ptest.Trigger{Code: 1, Msg: &hs0{1}, Peer: a}}},
-		p2ptest.Exchange{Label: "receiving repeated module handshake", Expects: []p2ptest.Expect{p2ptest.Expect{Code: 1, Msg: &hs0{43}, Peer: a}}}}
+		{Label: "alternative module handshake", Triggers: []p2ptest.Trigger{{Code: 1, Msg: &hs0{41}, Peer: a},
+			{Code: 1, Msg: &hs0{41}, Peer: b}}},
+		{Label: "repeated module handshake", Triggers: []p2ptest.Trigger{{Code: 1, Msg: &hs0{1}, Peer: a}}},
+		{Label: "receiving repeated module handshake", Expects: []p2ptest.Expect{{Code: 1, Msg: &hs0{43}, Peer: a}}}}
 }
 
 func runMultiplePeers(t *testing.T, peer int, errs ...error) {
@@ -332,7 +332,7 @@ WAIT:
 	// peer 0 sends kill request for peer with index <peer>
 	err := s.TestExchanges(p2ptest.Exchange{
 		Triggers: []p2ptest.Trigger{
-			p2ptest.Trigger{
+			{
 				Code: 2,
 				Msg:  &kill{s.IDs[peer]},
 				Peer: s.IDs[0],
@@ -347,7 +347,7 @@ WAIT:
 	// the peer not killed sends a drop request
 	err = s.TestExchanges(p2ptest.Exchange{
 		Triggers: []p2ptest.Trigger{
-			p2ptest.Trigger{
+			{
 				Code: 3,
 				Msg:  &drop{},
 				Peer: s.IDs[(peer+1)%2],