"time"
"github.com/davecgh/go-spew/spew"
- "github.com/tendermint/go-crypto"
-
cfg "github.com/vapor/config"
dbm "github.com/vapor/database/leveldb"
"github.com/vapor/errors"
conn "github.com/vapor/p2p/connection"
+ "github.com/vapor/p2p/signlib"
)
var (
testDB := dbm.NewDB("testdb", "leveldb", dirPath)
cfg := *testCfg
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
testDB := dbm.NewDB("testdb", "leveldb", dirPath)
cfg := *testCfg
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
rpCfg := *testCfg
- rp := &remotePeer{PrivKey: crypto.GenPrivKeyEd25519(), Config: &rpCfg}
+ remotePrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ rp := &remotePeer{PrivKey: remotePrivKey, Config: &rpCfg}
rp.Start()
defer rp.Stop()
s1.AddBannedPeer(rp.addr.IP.String())
testDB := dbm.NewDB("testdb", "leveldb", dirPath)
cfg := *testCfg
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
rpCfg := *testCfg
- rp := &remotePeer{PrivKey: crypto.GenPrivKeyEd25519(), Config: &rpCfg}
+ remotePrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ rp := &remotePeer{PrivKey: remotePrivKey, Config: &rpCfg}
rp.Start()
defer rp.Stop()
testDB := dbm.NewDB("testdb", "leveldb", dirPath)
cfg := *testCfg
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
inpCfg := *testCfg
- inp := &inboundPeer{PrivKey: crypto.GenPrivKeyEd25519(), config: &inpCfg}
+ inpPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ inp := &inboundPeer{PrivKey: inpPrivKey, config: &inpCfg}
addr := NewNetAddress(s1.listeners[0].(*DefaultListener).NetListener().Addr())
if err != nil {
t.Fatal(err)
cfg := *testCfg
cfg.P2P.MaxNumPeers = 2
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
inpCfg := *testCfg
- inpPrivKey := crypto.GenPrivKeyEd25519()
- //inpCfg.P2P.PrivateKey = inpPrivKey.String()
+ inpPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
inp := &inboundPeer{PrivKey: inpPrivKey, config: &inpCfg}
addr := NewNetAddress(s1.listeners[0].(*DefaultListener).NetListener().Addr())
if err != nil {
go inp.dial(addr)
rpCfg := *testCfg
- rpPrivKey := crypto.GenPrivKeyEd25519()
- //rpCfg.P2P.PrivateKey = rpPrivKey.String()
+ rpPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
rp := &remotePeer{PrivKey: rpPrivKey, Config: &rpCfg}
rp.Start()
defer rp.Stop()
}
inp2Cfg := *testCfg
- inp2PrivKey := crypto.GenPrivKeyEd25519()
- //inp2Cfg.P2P.PrivateKey = inp2PrivKey.String()
+
+ inp2PrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
inp2 := &inboundPeer{PrivKey: inp2PrivKey, config: &inp2Cfg}
go inp2.dial(addr)
cfg := *testCfg
cfg.P2P.MaxNumPeers = 2
cfg.P2P.ListenAddress = "127.0.1.1:0"
- swPrivKey := crypto.GenPrivKeyEd25519()
- //cfg.P2P.PrivateKey = swPrivKey.String()
+ swPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
s1 := MakeSwitch(&cfg, testDB, swPrivKey, initSwitchFunc)
s1.Start()
defer s1.Stop()
inpCfg := *testCfg
- inpPrivKey := crypto.GenPrivKeyEd25519()
- //inpCfg.P2P.PrivateKey = inpPrivKey.String()
- inp := &inboundPeer{PrivKey: inpPrivKey, config: &inpCfg}
+ inp2PrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+ inp := &inboundPeer{PrivKey: inp2PrivKey, config: &inpCfg}
addr := NewNetAddress(s1.listeners[0].(*DefaultListener).NetListener().Addr())
if err != nil {
t.Fatal(err)
go inp.dial(addr)
rpCfg := *testCfg
- rpPrivKey := crypto.GenPrivKeyEd25519()
- //rpCfg.P2P.PrivateKey = rpPrivKey.String()
+ rpPrivKey, err := signlib.NewPrivKey()
+ if err != nil {
+ t.Fatal(err)
+ }
+
rp := &remotePeer{PrivKey: rpPrivKey, Config: &rpCfg}
rp.Start()
defer rp.Stop()