Add p2p test util file

diff --git a/p2p/switch.go b/p2p/switch.go
index 3cafff9..003ad3d 100644 (file)
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -461,82 +461,4 @@ func (sw *Switch) checkBannedPeer(peer string) error {
        return nil
 }
 
-// Switches connected via arbitrary net.Conn; useful for testing
-// Returns n switches, connected according to the connect func.
-// If connect==Connect2Switches, the switches will be fully connected.
-// initSwitch defines how the ith switch should be initialized (ie. with what reactors).
-// NOTE: panics if any switch fails to start.
-func MakeConnectedSwitches(cfg *cfg.P2PConfig, n int, initSwitch func(int, *Switch) *Switch, connect func([]*Switch, int, int)) []*Switch {
-       switches := make([]*Switch, n)
-       for i := 0; i < n; i++ {
-               switches[i] = makeSwitch(cfg, i, "testing", "123.123.123", initSwitch)
-       }
-
-       if err := StartSwitches(switches); err != nil {
-               panic(err)
-       }
-
-       for i := 0; i < n; i++ {
-               for j := i; j < n; j++ {
-                       connect(switches, i, j)
-               }
-       }
-
-       return switches
-}
-
-var PanicOnAddPeerErr = false
-
-// Will connect switches i and j via net.Pipe()
-// Blocks until a conection is established.
-// NOTE: caller ensures i and j are within bounds
-func Connect2Switches(switches []*Switch, i, j int) {
-       switchI := switches[i]
-       switchJ := switches[j]
-       c1, c2 := net.Pipe()
-       doneCh := make(chan struct{})
-       go func() {
-               err := switchI.addPeerWithConnection(c1)
-               if PanicOnAddPeerErr && err != nil {
-                       panic(err)
-               }
-               doneCh <- struct{}{}
-       }()
-       go func() {
-               err := switchJ.addPeerWithConnection(c2)
-               if PanicOnAddPeerErr && err != nil {
-                       panic(err)
-               }
-               doneCh <- struct{}{}
-       }()
-       <-doneCh
-       <-doneCh
-}
-
-func StartSwitches(switches []*Switch) error {
-       for _, s := range switches {
-               _, err := s.Start() // start switch and reactors
-               if err != nil {
-                       return err
-               }
-       }
-       return nil
-}
-
-func makeSwitch(cfg *cfg.P2PConfig, i int, network, version string, initSwitch func(int, *Switch) *Switch) *Switch {
-       privKey := crypto.GenPrivKeyEd25519()
-       // new switch, add reactors
-       // TODO: let the config be passed in?
-       s := initSwitch(i, NewSwitch(cfg, nil))
-       s.SetNodeInfo(&NodeInfo{
-               PubKey:     privKey.PubKey().Unwrap().(crypto.PubKeyEd25519),
-               Moniker:    cmn.Fmt("switch%d", i),
-               Network:    network,
-               Version:    version,
-               RemoteAddr: cmn.Fmt("%v:%v", network, rand.Intn(64512)+1023),
-               ListenAddr: cmn.Fmt("%v:%v", network, rand.Intn(64512)+1023),
-       })
-       s.SetNodePrivKey(privKey)
-       return s
-}
 

diff --git a/p2p/test_util.go b/p2p/test_util.go
new file mode 100644 (file)
index 0000000..62d8b2b
--- /dev/null
+++ b/p2p/test_util.go
@@ -0,0 +1,90 @@
+package p2p
+
+import (
+       "math/rand"
+       "net"
+
+       "github.com/tendermint/go-crypto"
+       cmn "github.com/tendermint/tmlibs/common"
+
+       cfg "github.com/bytom/config"
+)
+
+var PanicOnAddPeerErr = false
+
+// Switches connected via arbitrary net.Conn; useful for testing
+// Returns n switches, connected according to the connect func.
+// If connect==Connect2Switches, the switches will be fully connected.
+// initSwitch defines how the ith switch should be initialized (ie. with what reactors).
+// NOTE: panics if any switch fails to start.
+func MakeConnectedSwitches(cfg *cfg.P2PConfig, n int, initSwitch func(int, *Switch) *Switch, connect func([]*Switch, int, int)) []*Switch {
+       switches := make([]*Switch, n)
+       for i := 0; i < n; i++ {
+               switches[i] = makeSwitch(cfg, i, "testing", "123.123.123", initSwitch)
+       }
+
+       if err := startSwitches(switches); err != nil {
+               panic(err)
+       }
+
+       for i := 0; i < n; i++ {
+               for j := i; j < n; j++ {
+                       connect(switches, i, j)
+               }
+       }
+
+       return switches
+}
+
+// Will connect switches i and j via net.Pipe()
+// Blocks until a conection is established.
+// NOTE: caller ensures i and j are within bounds
+func Connect2Switches(switches []*Switch, i, j int) {
+       switchI := switches[i]
+       switchJ := switches[j]
+       c1, c2 := net.Pipe()
+       doneCh := make(chan struct{})
+       go func() {
+               err := switchI.addPeerWithConnection(c1)
+               if PanicOnAddPeerErr && err != nil {
+                       panic(err)
+               }
+               doneCh <- struct{}{}
+       }()
+       go func() {
+               err := switchJ.addPeerWithConnection(c2)
+               if PanicOnAddPeerErr && err != nil {
+                       panic(err)
+               }
+               doneCh <- struct{}{}
+       }()
+       <-doneCh
+       <-doneCh
+}
+
+func startSwitches(switches []*Switch) error {
+       for _, s := range switches {
+               _, err := s.Start() // start switch and reactors
+               if err != nil {
+                       return err
+               }
+       }
+       return nil
+}
+
+func makeSwitch(cfg *cfg.P2PConfig, i int, network, version string, initSwitch func(int, *Switch) *Switch) *Switch {
+       privKey := crypto.GenPrivKeyEd25519()
+       // new switch, add reactors
+       // TODO: let the config be passed in?
+       s := initSwitch(i, NewSwitch(cfg, nil))
+       s.SetNodeInfo(&NodeInfo{
+               PubKey:     privKey.PubKey().Unwrap().(crypto.PubKeyEd25519),
+               Moniker:    cmn.Fmt("switch%d", i),
+               Network:    network,
+               Version:    version,
+               RemoteAddr: cmn.Fmt("%v:%v", network, rand.Intn(64512)+1023),
+               ListenAddr: cmn.Fmt("%v:%v", network, rand.Intn(64512)+1023),
+       })
+       s.SetNodePrivKey(privKey)
+       return s
+}