diff --git a/muxrpc/handlers/alias/register.go b/muxrpc/handlers/alias/register.go index 770b87a..7b6705d 100644 --- a/muxrpc/handlers/alias/register.go +++ b/muxrpc/handlers/alias/register.go @@ -7,12 +7,12 @@ import ( "fmt" "strings" + kitlog "github.com/go-kit/kit/log" + "go.cryptoscope.co/muxrpc/v2" + "github.com/ssb-ngi-pointer/go-ssb-room/aliases" "github.com/ssb-ngi-pointer/go-ssb-room/internal/network" - - kitlog "github.com/go-kit/kit/log" "github.com/ssb-ngi-pointer/go-ssb-room/roomdb" - "go.cryptoscope.co/muxrpc/v2" refs "go.mindeco.de/ssb-refs" ) diff --git a/muxrpc/test/go/alias_test.go b/muxrpc/test/go/alias_test.go index 1826f20..3097167 100644 --- a/muxrpc/test/go/alias_test.go +++ b/muxrpc/test/go/alias_test.go @@ -7,21 +7,20 @@ import ( "testing" "time" - "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" - "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.cryptoscope.co/muxrpc/v2" "golang.org/x/sync/errgroup" "github.com/ssb-ngi-pointer/go-ssb-room/aliases" - - "go.cryptoscope.co/muxrpc/v2" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys" + "github.com/ssb-ngi-pointer/go-ssb-room/roomsrv" ) // technically we are usign two servers here // but we just treat one of them as a muxrpc client func TestAliasRegister(t *testing.T) { + testInit(t) ctx, cancel := context.WithCancel(context.Background()) botgroup, ctx := errgroup.WithContext(ctx) bs := newBotServer(ctx, mainLog) diff --git a/roomsrv/server.go b/roomsrv/server.go index 4a6ba8c..b5751fd 100644 --- a/roomsrv/server.go +++ b/roomsrv/server.go @@ -12,10 +12,9 @@ import ( "path/filepath" "sync" - "go.cryptoscope.co/muxrpc/v2/typemux" - kitlog "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" + "go.cryptoscope.co/muxrpc/v2/typemux" "go.cryptoscope.co/netwrap" "github.com/ssb-ngi-pointer/go-ssb-room/internal/maybemod/keys"