fix: fmt error

Finschia · Oct 30, 2020 · 3fd9d02 · 3fd9d02
1 parent 1403890
commit 3fd9d02
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/blockchain/v0/reactor_test.go b/blockchain/v0/reactor_test.go
@@ -247,8 +247,8 @@ func TestBadBlockStopsPeer(t *testing.T) {
 		config.P2P.RecvAsync, config.P2P.BlockchainRecvBufSize)
 	reactorPairs = append(reactorPairs, lastReactorPair)
 
-	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1,
-		func(i int, s *p2p.Switch, config *cfg.P2PConfig) *p2p.Switch {
+	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1, func(i int, s *p2p.Switch,
+		config *cfg.P2PConfig) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[len(reactorPairs)-1].reactor)
 		return s
 

diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go
@@ -267,8 +267,8 @@ func TestFastSyncBadBlockStopsPeer(t *testing.T) {
 		reactorPairs[i] = newBlockchainReactorPair(t, logger[i], genDoc, privVals, height)
 	}
 
-	switches := p2p.MakeConnectedSwitches(config.P2P, numNodes,
-		func(i int, s *p2p.Switch, config *cfg.P2PConfig) *p2p.Switch {
+	switches := p2p.MakeConnectedSwitches(config.P2P, numNodes, func(i int, s *p2p.Switch,
+		config *cfg.P2PConfig) *p2p.Switch {
 		reactorPairs[i].conR.mtx.Lock()
 		s.AddReactor("BLOCKCHAIN", reactorPairs[i].bcR)
 		s.AddReactor("CONSENSUS", reactorPairs[i].conR)
@@ -310,8 +310,8 @@ outerFor:
 	lastReactorPair := newBlockchainReactorPair(t, lastLogger, genDoc, privVals, 0)
 	reactorPairs = append(reactorPairs, lastReactorPair)
 
-	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1,
-		func(i int, s *p2p.Switch, config *cfg.P2PConfig) *p2p.Switch {
+	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1, func(i int, s *p2p.Switch,
+		config *cfg.P2PConfig) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[len(reactorPairs)-1].bcR)
 		s.AddReactor("CONSENSUS", reactorPairs[len(reactorPairs)-1].conR)
 		moduleName := fmt.Sprintf("blockchain-%v", len(reactorPairs)-1)

diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go
@@ -100,8 +100,7 @@ func TestByzantine(t *testing.T) {
 		}
 	}()
 
-	p2p.MakeConnectedSwitches(config.P2P, N,
-		func(i int, s *p2p.Switch, config *config2.P2PConfig) *p2p.Switch {
+	p2p.MakeConnectedSwitches(config.P2P, N, func(i int, s *p2p.Switch, config *config2.P2PConfig) *p2p.Switch {
 		// ignore new switch s, we already made ours
 		switches[i].AddReactor("CONSENSUS", reactors[i])
 		return switches[i]

diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go
@@ -57,9 +57,9 @@ type Reactor interface {
 
 type BaseReactor struct {
 	service.BaseService // Provides Start, Stop, .Quit
-	Switch      *Switch
-	recvMsgBuf  chan *BufferedMsg
-	impl        Reactor
+	Switch              *Switch
+	recvMsgBuf          chan *BufferedMsg
+	impl                Reactor
 }
 
 func NewBaseReactor(name string, impl Reactor, async bool, recvBufSize int) *BaseReactor {

diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go
@@ -79,8 +79,8 @@ func TestPEXReactorRunning(t *testing.T) {
 
 	// create switches
 	for i := 0; i < N; i++ {
-		switches[i] = p2p.MakeSwitch(cfg, i, "testing", "123.123.123",
-			func(i int, sw *p2p.Switch, config *config.P2PConfig) *p2p.Switch {
+		switches[i] = p2p.MakeSwitch(cfg, i, "testing", "123.123.123", func(i int, sw *p2p.Switch,
+			config *config.P2PConfig) *p2p.Switch {
 			books[i] = NewAddrBook(filepath.Join(dir, fmt.Sprintf("addrbook%d.json", i)), false)
 			books[i].SetLogger(logger.With("pex", i))
 			sw.SetAddrBook(books[i])
@@ -415,8 +415,8 @@ func TestPEXReactorSeedModeFlushStop(t *testing.T) {
 
 	// create switches
 	for i := 0; i < N; i++ {
-		switches[i] = p2p.MakeSwitch(cfg, i, "testing", "123.123.123",
-			func(i int, sw *p2p.Switch, config *config.P2PConfig) *p2p.Switch {
+		switches[i] = p2p.MakeSwitch(cfg, i, "testing", "123.123.123", func(i int, sw *p2p.Switch,
+			config *config.P2PConfig) *p2p.Switch {
 			books[i] = NewAddrBook(filepath.Join(dir, fmt.Sprintf("addrbook%d.json", i)), false)
 			books[i].SetLogger(logger.With("pex", i))
 			sw.SetAddrBook(books[i])

diff --git a/p2p/switch_test.go b/p2p/switch_test.go
@@ -689,11 +689,10 @@ func (r *mockReactor) InitCalledBeforeRemoveFinished() bool {
 func TestSwitchInitPeerIsNotCalledBeforeRemovePeer(t *testing.T) {
 	// make reactor
 	reactor := &mockReactor{}
-	reactor.BaseReactor = NewBaseReactor("mockReactor", reactor, true,1000)
+	reactor.BaseReactor = NewBaseReactor("mockReactor", reactor, true, 1000)
 
 	// make switch
-	sw := MakeSwitch(cfg, 1, "testing", "123.123.123",
-		func(i int, sw *Switch, config *config.P2PConfig) *Switch {
+	sw := MakeSwitch(cfg, 1, "testing", "123.123.123", func(i int, sw *Switch, config *config.P2PConfig) *Switch {
 		sw.AddReactor("mock", reactor)
 		return sw
 	}) // mock reactor uses 1000 chan buffer

diff --git a/rpc/core/net_test.go b/rpc/core/net_test.go
@@ -44,7 +44,7 @@ func TestUnsafeDialSeeds(t *testing.T) {
 
 func TestUnsafeDialPeers(t *testing.T) {
 	sw := p2p.MakeSwitch(cfg.DefaultP2PConfig(), 1, "testing", "123.123.123",
-		func(n int, sw *p2p.Switch,  config *cfg.P2PConfig) *p2p.Switch { return sw })
+		func(n int, sw *p2p.Switch, config *cfg.P2PConfig) *p2p.Switch { return sw })
 	err := sw.Start()
 	require.NoError(t, err)
 	defer sw.Stop()