From 76d73548d623c42ad47f5e8d2297d5f32f6f9dcd Mon Sep 17 00:00:00 2001 From: Viktor Liu Date: Mon, 10 Mar 2025 18:46:01 +0100 Subject: [PATCH] Fix more conflicts --- client/firewall/uspfilter/tracer_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/firewall/uspfilter/tracer_test.go b/client/firewall/uspfilter/tracer_test.go index d8269f254..48b0ec44d 100644 --- a/client/firewall/uspfilter/tracer_test.go +++ b/client/firewall/uspfilter/tracer_test.go @@ -10,8 +10,8 @@ import ( fw "github.com/netbirdio/netbird/client/firewall/manager" "github.com/netbirdio/netbird/client/firewall/uspfilter/conntrack" "github.com/netbirdio/netbird/client/firewall/uspfilter/forwarder" - "github.com/netbirdio/netbird/client/iface" "github.com/netbirdio/netbird/client/iface/device" + "github.com/netbirdio/netbird/client/iface/wgaddr" ) func verifyTraceStages(t *testing.T, trace *PacketTrace, expectedStages []PacketStage) { @@ -36,8 +36,8 @@ func TestTracePacket(t *testing.T) { setupTracerTest := func(statefulMode bool) *Manager { ifaceMock := &IFaceMock{ SetFilterFunc: func(device.PacketFilter) error { return nil }, - AddressFunc: func() iface.WGAddress { - return iface.WGAddress{ + AddressFunc: func() wgaddr.Address { + return wgaddr.Address{ IP: net.ParseIP("100.10.0.100"), Network: &net.IPNet{ IP: net.ParseIP("100.10.0.0"),