chore(imports): reorganize import statements across multiple files

Author: mrz1836

examples/advertiser/main.go

@@ -7,11 +7,12 @@ import (
 	"log/slog"
 	"os"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/advertiser"
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	oa "github.com/bsv-blockchain/go-overlay-services/pkg/core/advertiser"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/script"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/advertiser"
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 func main() {

examples/ship/main.go

@@ -10,16 +10,16 @@ import (
 	"log/slog"
 	"os"
 
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/ship"
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	"github.com/bsv-blockchain/go-overlay-services/pkg/core/engine"
 	"github.com/bsv-blockchain/go-sdk/chainhash"
 	"github.com/bsv-blockchain/go-sdk/overlay/lookup"
 	"github.com/bsv-blockchain/go-sdk/script"
 	"github.com/bsv-blockchain/go-sdk/transaction"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/ship"
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 //nolint:gochecknoglobals // logger is used across multiple example functions

pkg/advertiser/wallet_advertiser.go

@@ -15,8 +15,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 	oa "github.com/bsv-blockchain/go-overlay-services/pkg/core/advertiser"
 	authhttp "github.com/bsv-blockchain/go-sdk/auth/clients/authhttp"
 	"github.com/bsv-blockchain/go-sdk/overlay"
@@ -32,6 +30,9 @@ import (
 	"github.com/bsv-blockchain/go-wallet-toolbox/pkg/storage"
 	toolboxWallet "github.com/bsv-blockchain/go-wallet-toolbox/pkg/wallet"
 	"github.com/bsv-blockchain/go-wallet-toolbox/pkg/wdk"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 )
 
 // AdTokenValue is the default token value used for advertisements.

pkg/advertiser/wallet_advertiser_test.go

@@ -5,14 +5,14 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/bsv-blockchain/go-sdk/transaction"
-
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	oa "github.com/bsv-blockchain/go-overlay-services/pkg/core/advertiser"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/script"
+	"github.com/bsv-blockchain/go-sdk/transaction"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 func TestNewWalletAdvertiser(t *testing.T) {

pkg/ship/lookup_service.go

@@ -10,13 +10,14 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	"github.com/bsv-blockchain/go-overlay-services/pkg/core/engine"
 	"github.com/bsv-blockchain/go-sdk/chainhash"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/overlay/lookup"
 	"github.com/bsv-blockchain/go-sdk/transaction"
 	"github.com/bsv-blockchain/go-sdk/transaction/template/pushdrop"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 // Constants for SHIP service configuration

pkg/ship/lookup_service_test.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	"github.com/bsv-blockchain/go-overlay-services/pkg/core/engine"
 	"github.com/bsv-blockchain/go-sdk/chainhash"
 	"github.com/bsv-blockchain/go-sdk/overlay/lookup"
@@ -16,6 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 const TxID = "bdf1e48e845a65ba8c139c9b94844de30716f38d53787ba0a435e8705c4216d5"

pkg/ship/topic_manager.go

@@ -12,10 +12,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/transaction"
 	"github.com/bsv-blockchain/go-sdk/transaction/template/pushdrop"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 )
 
 // Static error variables for err113 compliance

pkg/slap/lookup_service.go

@@ -10,13 +10,14 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	"github.com/bsv-blockchain/go-overlay-services/pkg/core/engine"
 	"github.com/bsv-blockchain/go-sdk/chainhash"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/overlay/lookup"
 	"github.com/bsv-blockchain/go-sdk/transaction"
 	"github.com/bsv-blockchain/go-sdk/transaction/template/pushdrop"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 // Constants for SLAP service configuration

pkg/slap/lookup_service_test.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 	"github.com/bsv-blockchain/go-overlay-services/pkg/core/engine"
 	"github.com/bsv-blockchain/go-sdk/chainhash"
 	"github.com/bsv-blockchain/go-sdk/overlay/lookup"
@@ -16,6 +15,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/types"
 )
 
 const TxID = "bdf1e48e845a65ba8c139c9b94844de30716f38d53787ba0a435e8705c4216d5"

pkg/slap/topic_manager.go

@@ -12,10 +12,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 	"github.com/bsv-blockchain/go-sdk/overlay"
 	"github.com/bsv-blockchain/go-sdk/transaction"
 	"github.com/bsv-blockchain/go-sdk/transaction/template/pushdrop"
+
+	"github.com/bsv-blockchain/go-overlay-discovery-services/pkg/utils"
 )
 
 // Static error variables for err113 compliance