merge conflict follow up

node/node.go

@@ -441,17 +441,16 @@ func makeNode(config *cfg.Config,
 			ProxyAppQuery:   proxyApp.Query(),
 			ProxyAppMempool: proxyApp.Mempool(),
 
-			StateStore:       stateStore,
-			BlockStore:       blockStore,
-			EvidencePool:     evPool,
-			ConsensusState:   csState,
-      
-			WaitSyncChecker:  csReactor,
-			BlockSyncReactor: bcReactor.(cs.BlockSyncReactor),
-      
-      P2PPeers:         sw,
-     	PeerManager: peerManager,
+			StateStore:     stateStore,
+			BlockStore:     blockStore,
+			EvidencePool:   evPool,
+			ConsensusState: csState,
 
+			ConsensusReactor: csReactor,
+			BlockSyncReactor: bcReactor.(cs.BlockSyncReactor),
+
+			P2PPeers:    sw,
+			PeerManager: peerManager,
 
 			GenDoc:     genDoc,
 			EventSinks: eventSinks,
@@ -459,17 +458,6 @@ func makeNode(config *cfg.Config,
 			Mempool:    mp,
 			Logger:     logger.With("module", "rpc"),
 			Config:     *config.RPC,
-
-			P2PPeers:    sw,
-			PeerManager: peerManager,
-
-			GenDoc:           genDoc,
-			EventSinks:       eventSinks,
-			ConsensusReactor: csReactor,
-			EventBus:         eventBus,
-			Mempool:          mp,
-			Logger:           logger.With("module", "rpc"),
-			Config:           *config.RPC,
 		},
 	}