merge develop into branch and resolve conflicts
@@ -4,7 +4,7 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/spacemeshos/go-spacemesh/crypto"
"github.com/spacemeshos/go-spacemesh/hare/pb"
- "github.com/spacemeshos/go-spacemesh/p2p/simulator"
+ "github.com/spacemeshos/go-spacemesh/p2p/service"
"github.com/stretchr/testify/assert"
"testing"
)
@@ -21,7 +21,7 @@ func getPublicKey(t *testing.T) crypto.PublicKey {
// test that a message to a specific layer is delivered by the broker
func TestConsensusProcess_StartTwice(t *testing.T) {
- sim := simulator.New()
+ sim := service.NewSimulator()
n1 := sim.NewNode()
broker := NewBroker(n1)
@@ -38,7 +38,7 @@ func TestConsensusProcess_StartTwice(t *testing.T) {
}
func TestConsensusProcess_eventLoop(t *testing.T) {
- sim := simulator.New()
+ sim := service.NewSimulator()
n1 := sim.NewNode()
n2 := sim.NewNode()
@@ -57,7 +57,7 @@ func TestConsensusProcess_eventLoop(t *testing.T) {
}
func TestConsensusProcess_handleMessage(t *testing.T) {
- sim := simulator.New()
+ sim := service.NewSimulator()
n1 := sim.NewNode()
broker := NewBroker(n1)
@@ -88,7 +88,7 @@ func TestConsensusProcess_handleMessage(t *testing.T) {
}
func TestConsensusProcess_nextRound(t *testing.T) {
- sim := simulator.New()
+ sim := service.NewSimulator()
n1 := sim.NewNode()
broker := NewBroker(n1)
