applied changes to routingtable*

routingtable/locRIB/loc_rib_test.go

@@ -3,7 +3,6 @@ package locRIB
 import (
 	"testing"
 
-	"github.com/bio-routing/bio-rd/net"
 	bnet "github.com/bio-routing/bio-rd/net"
 	"github.com/bio-routing/bio-rd/route"
 
@@ -11,7 +10,7 @@ import (
 )
 
 type pfxPath struct {
-	pfx  net.Prefix
+	pfx  bnet.Prefix
 	path *route.Path
 }
 
@@ -26,7 +25,7 @@ func TestContainsPfxPath(t *testing.T) {
 		{
 			in: []pfxPath{},
 			check: pfxPath{
-				pfx:  net.NewPfx(1, 32),
+				pfx:  bnet.NewPfx(bnet.IPv4(1), 32),
 				path: nil,
 			},
 			expected: false,
@@ -35,7 +34,7 @@ func TestContainsPfxPath(t *testing.T) {
 		{
 			in: []pfxPath{
 				{
-					pfx: net.NewPfx(1, 32),
+					pfx: bnet.NewPfx(bnet.IPv4(1), 32),
 					path: &route.Path{
 						Type: route.StaticPathType,
 						StaticPath: &route.StaticPath{
@@ -45,7 +44,7 @@ func TestContainsPfxPath(t *testing.T) {
 				},
 			},
 			check: pfxPath{
-				pfx:  net.NewPfx(1, 32),
+				pfx:  bnet.NewPfx(bnet.IPv4(1), 32),
 				path: nil,
 			},
 			expected: false,
@@ -54,7 +53,7 @@ func TestContainsPfxPath(t *testing.T) {
 		{
 			in: []pfxPath{
 				{
-					pfx: net.NewPfx(1, 32),
+					pfx: bnet.NewPfx(bnet.IPv4(1), 32),
 					path: &route.Path{
 						Type: route.StaticPathType,
 						StaticPath: &route.StaticPath{
@@ -64,7 +63,7 @@ func TestContainsPfxPath(t *testing.T) {
 				},
 			},
 			check: pfxPath{
-				pfx: net.NewPfx(1, 32),
+				pfx: bnet.NewPfx(bnet.IPv4(1), 32),
 				path: &route.Path{
 					Type: route.StaticPathType,
 					StaticPath: &route.StaticPath{
@@ -88,7 +87,7 @@ func TestContainsPfxPath(t *testing.T) {
 
 func TestLocRIB_RemovePathUnknown(t *testing.T) {
 	rib := New()
-	assert.True(t, rib.RemovePath(net.NewPfx(1, 32),
+	assert.True(t, rib.RemovePath(bnet.NewPfx(bnet.IPv4(1), 32),
 		&route.Path{
 			Type: route.StaticPathType,
 			StaticPath: &route.StaticPath{

routingtable/update_helper_test.go

@@ -73,7 +73,7 @@ func TestShouldPropagateUpdate(t *testing.T) {
 				comms = append(comms, com)
 			}
 
-			pfx := bnet.NewPfx(0, 32)
+			pfx := bnet.NewPfx(bnet.IPv4(0), 32)
 			pa := &route.Path{
 				Type: route.BGPPathType,
 				BGPPath: &route.BGPPath{