Merge pull request #167 from dedis/router-myaddr

Router: Accept node's address

mino/minogrpc/rpc.go

@@ -146,7 +146,7 @@ func (rpc RPC) Stream(ctx context.Context, players mino.Players) (mino.Sender, m
 		headerStreamIDKey, streamID,
 		headerGatewayKey, rpc.overlay.myAddrStr)
 
-	table, err := rpc.overlay.router.New(mino.NewAddresses())
+	table, err := rpc.overlay.router.New(mino.NewAddresses(), rpc.overlay.myAddr)
 	if err != nil {
 		return nil, nil, xerrors.Errorf("routing table failed: %v", err)
 	}

mino/minogrpc/rpc_test.go

@@ -427,7 +427,7 @@ func (r badRouter) GetHandshakeFactory() router.HandshakeFactory {
 	return fakeHandshakeFactory{}
 }
 
-func (badRouter) New(mino.Players) (router.RoutingTable, error) {
+func (badRouter) New(mino.Players, mino.Address) (router.RoutingTable, error) {
 	return nil, fake.GetError()
 }
 

mino/minogrpc/server.go

@@ -366,7 +366,7 @@ func (o *overlayServer) tableFromHeaders(h metadata.MD) (router.RoutingTable, bo
 		addrs[i] = o.addrFactory.FromText([]byte(addr))
 	}
 
-	table, err := o.router.New(mino.NewAddresses(addrs...))
+	table, err := o.router.New(mino.NewAddresses(addrs...), o.myAddr)
 	if err != nil {
 		return nil, true, xerrors.Errorf("failed to create: %v", err)
 	}

mino/router/mod.go

@@ -67,7 +67,7 @@ type Router interface {
 	GetHandshakeFactory() HandshakeFactory
 
 	// New creates a new routing table that will forward packets to the players.
-	New(mino.Players) (RoutingTable, error)
+	New(players mino.Players, me mino.Address) (RoutingTable, error)
 
 	// GenerateTableFrom returns the routing table associated to the handshake.
 	// A node should be able to route any incoming packet after receiving one.

mino/router/tree/example_test.go

@@ -15,7 +15,7 @@ func ExampleRouter_New() {
 
 	players := mino.NewAddresses(addrA, addrB)
 
-	table, err := router.New(players)
+	table, err := router.New(players, addrA)
 	if err != nil {
 		panic("routing table failed: " + err.Error())
 	}
@@ -39,7 +39,7 @@ func ExampleTable_PrepareHandshakeFor() {
 
 	players := mino.NewAddresses(addrA, addrB)
 
-	table, err := routerA.New(players)
+	table, err := routerA.New(players, addrA)
 	if err != nil {
 		panic("routing table failed: " + err.Error())
 	}

mino/router/tree/mod.go

@@ -59,7 +59,7 @@ func (r Router) GetHandshakeFactory() router.HandshakeFactory {
 
 // New implements router.Router. It creates the routing table for the node that
 // is booting the protocol. This node will be the root of the tree.
-func (r Router) New(players mino.Players) (router.RoutingTable, error) {
+func (r Router) New(players mino.Players, me mino.Address) (router.RoutingTable, error) {
 	addrs := make([]mino.Address, 0, players.Len())
 	iter := players.AddressIterator()
 	for iter.HasNext() {

mino/router/tree/mod_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.dedis.ch/dela/internal/testing/fake"
 	"go.dedis.ch/dela/mino"
+	minoRouter "go.dedis.ch/dela/mino/router"
 	"go.dedis.ch/dela/mino/router/tree/types"
 )
 
@@ -27,7 +28,16 @@ func TestRouter_New(t *testing.T) {
 		router := NewRouter(fake.AddressFactory{})
 		router.maxHeight = int(height)
 
-		table, err := router.New(mino.NewAddresses(makeAddrs(int(n))...))
+		fakeAddrs := makeAddrs(int(n))
+
+		var table minoRouter.RoutingTable
+		var err error
+
+		if n > 0 {
+			table, err = router.New(mino.NewAddresses(fakeAddrs...), fakeAddrs[0])
+		} else {
+			table, err = router.New(mino.NewAddresses(fakeAddrs...), nil)
+		}
 		require.NoError(t, err)
 
 		return router.maxHeight == table.(Table).tree.GetMaxHeight()