From 5bc855d89f50fa03cfd7b6a9fab3f8bece69407c Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Mon, 24 Feb 2025 13:59:57 +0000 Subject: [PATCH] fix merge Signed-off-by: bcmmbaga --- management/server/http/handlers/peers/peers_handler_test.go | 3 --- management/server/store/sql_store_test.go | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/management/server/http/handlers/peers/peers_handler_test.go b/management/server/http/handlers/peers/peers_handler_test.go index 8e07567c7..63b8c0ab3 100644 --- a/management/server/http/handlers/peers/peers_handler_test.go +++ b/management/server/http/handlers/peers/peers_handler_test.go @@ -146,9 +146,6 @@ func initTestMetaData(peers ...*nbpeer.Peer) *Handler { GetAccountFunc: func(ctx context.Context, accountID string) (*types.Account, error) { return account, nil }, - GetAccountFunc: func(ctx context.Context, accountID string) (*types.Account, error) { - return account, nil - }, GetAccountByIDFunc: func(ctx context.Context, accountID string, userID string) (*types.Account, error) { return account, nil }, diff --git a/management/server/store/sql_store_test.go b/management/server/store/sql_store_test.go index 46ef0eaa3..478406eaa 100644 --- a/management/server/store/sql_store_test.go +++ b/management/server/store/sql_store_test.go @@ -15,19 +15,17 @@ import ( "time" "github.com/google/uuid" - "github.com/rs/xid" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - nbdns "github.com/netbirdio/netbird/dns" - "github.com/netbirdio/netbird/management/server/util" resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types" routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types" networkTypes "github.com/netbirdio/netbird/management/server/networks/types" "github.com/netbirdio/netbird/management/server/posture" "github.com/netbirdio/netbird/management/server/types" + "github.com/netbirdio/netbird/management/server/util" route2 "github.com/netbirdio/netbird/route"