move connection to it's folder

[bytom/bytom.git] / p2p / test_util.go

diff --git a/p2p/test_util.go b/p2p/test_util.go
index c16a6b4..d01fa6a 100644 (file)
--- a/p2p/test_util.go
+++ b/p2p/test_util.go
@@ -8,11 +8,41 @@ import (
        cmn "github.com/tendermint/tmlibs/common"
 
        cfg "github.com/bytom/config"
+       "github.com/bytom/p2p/connection"
 )
 
 //PanicOnAddPeerErr add peer error
 var PanicOnAddPeerErr = false
 
+func CreateRandomPeer(outbound bool) *Peer {
+       _, netAddr := CreateRoutableAddr()
+       p := &Peer{
+               peerConn: &peerConn{
+                       outbound: outbound,
+               },
+               NodeInfo: &NodeInfo{
+                       ListenAddr: netAddr.DialString(),
+               },
+               mconn: &connection.MConnection{},
+       }
+       return p
+}
+
+func CreateRoutableAddr() (addr string, netAddr *NetAddress) {
+       for {
+               var err error
+               addr = cmn.Fmt("%X@%v.%v.%v.%v:46656", cmn.RandBytes(20), cmn.RandInt()%256, cmn.RandInt()%256, cmn.RandInt()%256, cmn.RandInt()%256)
+               netAddr, err = NewNetAddressString(addr)
+               if err != nil {
+                       panic(err)
+               }
+               if netAddr.Routable() {
+                       break
+               }
+       }
+       return
+}
+
 // MakeConnectedSwitches 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.
@@ -21,7 +51,7 @@ var PanicOnAddPeerErr = false
 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)
+               switches[i] = MakeSwitch(cfg, i, "testing", "123.123.123", initSwitch)
        }
 
        if err := startSwitches(switches); err != nil {
@@ -73,7 +103,7 @@ func startSwitches(switches []*Switch) error {
        return nil
 }
 
-func makeSwitch(cfg *cfg.P2PConfig, i int, network, version string, initSwitch func(int, *Switch) *Switch) *Switch {
+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?
@@ -83,7 +113,6 @@ func makeSwitch(cfg *cfg.P2PConfig, i int, network, version string, initSwitch f
                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)