Fix custom import section in linter configuration (#314)

gammazero · Apr 2, 2024 · 6e73a60 · 6e73a60
1 parent ea2a2b1
commit 6e73a60
Show file tree

Hide file tree

Showing 35 changed files with 74 additions and 40 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -81,7 +81,7 @@ linters-settings:
     sections:
       - standard # Standard section: captures all standard packages.
       - default # Default section: contains all imports that could not be matched to another section type.
-      - prefix(github.com/s-things) # Custom section: groups all imports with the specified Prefix.
+      - prefix(github.com/gammazero) # Custom section: groups all imports with the specified Prefix.
     # Skip generated files.
     # Default: true
     #skip-generated: false

diff --git a/aat/auth_test.go b/aat/auth_test.go
@@ -11,11 +11,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/pbkdf2"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/gammazero/nexus/v3/wamp/crsign"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/crypto/pbkdf2"
 )
 
 const (

diff --git a/aat/main_test.go b/aat/main_test.go
@@ -14,14 +14,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+	"go.uber.org/goleak"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/router"
 	"github.com/gammazero/nexus/v3/router/auth"
 	"github.com/gammazero/nexus/v3/stdlog"
 	"github.com/gammazero/nexus/v3/transport/serialize"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/goleak"
 )
 
 const (

diff --git a/aat/pubsub_test.go b/aat/pubsub_test.go
@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 const (

diff --git a/aat/registration_meta_test.go b/aat/registration_meta_test.go
@@ -7,9 +7,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const (

diff --git a/aat/rpc_progress_test.go b/aat/rpc_progress_test.go
@@ -6,9 +6,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const (

diff --git a/aat/rpc_shared_test.go b/aat/rpc_shared_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 func TestRPCSharedRoundRobin(t *testing.T) {

diff --git a/aat/rpc_test.go b/aat/rpc_test.go
@@ -6,9 +6,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 func TestRPCRegisterAndCall(t *testing.T) {

diff --git a/aat/session_meta_kill_test.go b/aat/session_meta_kill_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const (

diff --git a/aat/session_meta_test.go b/aat/session_meta_test.go
@@ -6,9 +6,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const (

diff --git a/aat/session_testament_meta_test.go b/aat/session_testament_meta_test.go
@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 const (

diff --git a/aat/sessionfilter_test.go b/aat/sessionfilter_test.go
@@ -4,9 +4,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 func TestWhitelistAttribute(t *testing.T) {

diff --git a/aat/subscription_meta_test.go b/aat/subscription_meta_test.go
@@ -7,9 +7,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/client"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const (

diff --git a/client/client_test.go b/client/client_test.go
@@ -12,13 +12,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+	"go.uber.org/goleak"
+
 	"github.com/gammazero/nexus/v3/router"
 	"github.com/gammazero/nexus/v3/router/auth"
 	"github.com/gammazero/nexus/v3/stdlog"
 	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/gammazero/nexus/v3/wamp/crsign"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/goleak"
 )
 
 const (

diff --git a/router/auth/anonymous_test.go b/router/auth/anonymous_test.go
@@ -3,9 +3,10 @@ package auth_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/router/auth"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 func TestAnonAuth(t *testing.T) {

diff --git a/router/auth/crauth_test.go b/router/auth/crauth_test.go
@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/router/auth"
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/gammazero/nexus/v3/wamp/crsign"
-	"github.com/stretchr/testify/require"
 )
 
 type testKeyStore struct {

diff --git a/router/auth/cryptosign.go b/router/auth/cryptosign.go
@@ -7,8 +7,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"golang.org/x/crypto/nacl/sign"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 type CryptoSignAuthenticator struct {

diff --git a/router/authorizer_test.go b/router/authorizer_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 const (

diff --git a/router/broker_test.go b/router/broker_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 type testPeer struct {

diff --git a/router/dealer_test.go b/router/dealer_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 func newTestDealer(t *testing.T) (*dealer, wamp.Peer) {

diff --git a/router/publishfilter_test.go b/router/publishfilter_test.go
@@ -3,8 +3,9 @@ package router
 import (
 	"testing"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 func TestFilterBlacklist(t *testing.T) {

diff --git a/router/rawsocketserver_test.go b/router/rawsocketserver_test.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/transport/serialize"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
 )
 
 const tcpAddr = "127.0.0.1:8181"

diff --git a/router/router_test.go b/router/router_test.go
@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+	"go.uber.org/goleak"
+
 	"github.com/gammazero/nexus/v3/stdlog"
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/goleak"
 )
 
 const (

diff --git a/router/sessionkill_test.go b/router/sessionkill_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 func TestSessionKill(t *testing.T) {

diff --git a/router/testaments_test.go b/router/testaments_test.go
@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 func TestSessionTestaments(t *testing.T) {

diff --git a/router/websocketserver.go b/router/websocketserver.go
@@ -14,10 +14,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gorilla/websocket"
+
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/transport/serialize"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/gorilla/websocket"
 )
 
 const (

diff --git a/router/websocketserver_test.go b/router/websocketserver_test.go
@@ -6,11 +6,12 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/gorilla/websocket"
+	"github.com/stretchr/testify/require"
+
 	"github.com/gammazero/nexus/v3/transport"
 	"github.com/gammazero/nexus/v3/transport/serialize"
 	"github.com/gammazero/nexus/v3/wamp"
-	"github.com/gorilla/websocket"
-	"github.com/stretchr/testify/require"
 )
 
 var (

diff --git a/transport/localpeer_test.go b/transport/localpeer_test.go
@@ -5,8 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 func TestSendRecv(t *testing.T) {

diff --git a/transport/serialize/cborserializer.go b/transport/serialize/cborserializer.go
@@ -4,8 +4,9 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/ugorji/go/codec"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 var ch *codec.CborHandle

diff --git a/transport/serialize/jsonserializer.go b/transport/serialize/jsonserializer.go
@@ -5,8 +5,9 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/ugorji/go/codec"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 var jh *codec.JsonHandle

diff --git a/transport/serialize/msgpackserializer.go b/transport/serialize/msgpackserializer.go
@@ -4,8 +4,9 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/ugorji/go/codec"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 var mh *codec.MsgpackHandle

diff --git a/transport/serialize/serializer_test.go b/transport/serialize/serializer_test.go
@@ -7,8 +7,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gammazero/nexus/v3/wamp"
 	"github.com/stretchr/testify/require"
+
+	"github.com/gammazero/nexus/v3/wamp"
 )
 
 var dataItem = []map[string]interface{}{{