Revert useless distribution aliases in gRPC framer tests

These test files import only the distribution package; the gRPC child lives in the
separate suite file, so there is no in-file conflict and no alias is needed. The mock
tests keep their aliases since they import both packages in one file.

Author: pjdotson

core/pkg/distribution/transport/grpc/framer/deleter/transport_test.go

@@ -18,22 +18,22 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/synnaxlabs/freighter"
 	"github.com/synnaxlabs/synnax/pkg/distribution/channel"
-	distdeleter "github.com/synnaxlabs/synnax/pkg/distribution/framer/deleter"
+	"github.com/synnaxlabs/synnax/pkg/distribution/framer/deleter"
 )
 
 var _ = Describe("Transport", func() {
 	It("Should round-trip a delete request over the wire", func(ctx SpecContext) {
-		var received distdeleter.Request
+		var received deleter.Request
 		transport.Server().BindHandler(
-			func(_ context.Context, req distdeleter.Request) (types.Nil, error) {
+			func(_ context.Context, req deleter.Request) (types.Nil, error) {
 				received = req
 				return types.Nil{}, nil
 			},
 		)
 		Expect(transport.Client().Send(
 			ctx,
 			addr,
-			distdeleter.Request{Keys: channel.Keys{1, 2, 3}},
+			deleter.Request{Keys: channel.Keys{1, 2, 3}},
 		)).To(Equal(types.Nil{}))
 		Expect(received.Keys).To(Equal(channel.Keys{1, 2, 3}))
 	})
@@ -59,14 +59,14 @@ var _ = Describe("Transport", func() {
 				return next(mCtx)
 			}))
 			transport.Server().BindHandler(
-				func(_ context.Context, _ distdeleter.Request) (types.Nil, error) {
+				func(_ context.Context, _ deleter.Request) (types.Nil, error) {
 					return types.Nil{}, nil
 				},
 			)
 			Expect(transport.Client().Send(
 				ctx,
 				addr,
-				distdeleter.Request{Keys: channel.Keys{1}},
+				deleter.Request{Keys: channel.Keys{1}},
 			)).To(Equal(types.Nil{}))
 			Expect(clientCalls.Load()).To(Equal(int32(1)))
 			Expect(serverCalls.Load()).To(Equal(int32(1)))

core/pkg/distribution/transport/grpc/framer/iterator/transport_test.go

@@ -16,24 +16,24 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/synnaxlabs/freighter"
-	distiterator "github.com/synnaxlabs/synnax/pkg/distribution/framer/iterator"
+	"github.com/synnaxlabs/synnax/pkg/distribution/framer/iterator"
 	. "github.com/synnaxlabs/x/testutil"
 )
 
 var _ = Describe("Transport", func() {
 	It("Should round-trip a request over the wire", func(ctx SpecContext) {
 		transport.Server().BindHandler(func(
 			_ context.Context,
-			srv freighter.ServerStream[distiterator.Request, distiterator.Response],
+			srv freighter.ServerStream[iterator.Request, iterator.Response],
 		) error {
 			req, err := srv.Receive()
 			if err != nil {
 				return err
 			}
-			return srv.Send(distiterator.Response{SeqNum: req.SeqNum})
+			return srv.Send(iterator.Response{SeqNum: req.SeqNum})
 		})
 		stream := MustSucceed(transport.Client().Stream(ctx, addr))
-		Expect(stream.Send(distiterator.Request{SeqNum: 42})).To(Succeed())
+		Expect(stream.Send(iterator.Request{SeqNum: 42})).To(Succeed())
 		Expect(MustSucceed(stream.Receive()).SeqNum).To(Equal(42))
 		Expect(stream.CloseSend()).To(Succeed())
 	})
@@ -60,15 +60,15 @@ var _ = Describe("Transport", func() {
 			}))
 			transport.Server().BindHandler(func(
 				_ context.Context,
-				srv freighter.ServerStream[distiterator.Request, distiterator.Response],
+				srv freighter.ServerStream[iterator.Request, iterator.Response],
 			) error {
 				if _, err := srv.Receive(); err != nil {
 					return err
 				}
-				return srv.Send(distiterator.Response{})
+				return srv.Send(iterator.Response{})
 			})
 			stream := MustSucceed(transport.Client().Stream(ctx, addr))
-			Expect(stream.Send(distiterator.Request{SeqNum: 1})).To(Succeed())
+			Expect(stream.Send(iterator.Request{SeqNum: 1})).To(Succeed())
 			MustSucceed(stream.Receive())
 			Expect(stream.CloseSend()).To(Succeed())
 			Expect(clientCalls.Load()).To(Equal(int32(1)))

core/pkg/distribution/transport/grpc/framer/relay/transport_test.go

@@ -17,23 +17,23 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/synnaxlabs/freighter"
 	"github.com/synnaxlabs/synnax/pkg/distribution/channel"
-	distrelay "github.com/synnaxlabs/synnax/pkg/distribution/framer/relay"
+	"github.com/synnaxlabs/synnax/pkg/distribution/framer/relay"
 	. "github.com/synnaxlabs/x/testutil"
 )
 
 var _ = Describe("Transport", func() {
 	It("Should round-trip a request over the wire", func(ctx SpecContext) {
 		transport.Server().BindHandler(func(
 			_ context.Context,
-			srv freighter.ServerStream[distrelay.Request, distrelay.Response],
+			srv freighter.ServerStream[relay.Request, relay.Response],
 		) error {
 			if _, err := srv.Receive(); err != nil {
 				return err
 			}
-			return srv.Send(distrelay.Response{Group: 7})
+			return srv.Send(relay.Response{Group: 7})
 		})
 		stream := MustSucceed(transport.Client().Stream(ctx, addr))
-		Expect(stream.Send(distrelay.Request{Keys: channel.Keys{1, 2}})).To(Succeed())
+		Expect(stream.Send(relay.Request{Keys: channel.Keys{1, 2}})).To(Succeed())
 		Expect(MustSucceed(stream.Receive()).Group).To(Equal(uint32(7)))
 		Expect(stream.CloseSend()).To(Succeed())
 	})
@@ -60,15 +60,15 @@ var _ = Describe("Transport", func() {
 			}))
 			transport.Server().BindHandler(func(
 				_ context.Context,
-				srv freighter.ServerStream[distrelay.Request, distrelay.Response],
+				srv freighter.ServerStream[relay.Request, relay.Response],
 			) error {
 				if _, err := srv.Receive(); err != nil {
 					return err
 				}
-				return srv.Send(distrelay.Response{})
+				return srv.Send(relay.Response{})
 			})
 			stream := MustSucceed(transport.Client().Stream(ctx, addr))
-			Expect(stream.Send(distrelay.Request{})).To(Succeed())
+			Expect(stream.Send(relay.Request{})).To(Succeed())
 			MustSucceed(stream.Receive())
 			Expect(stream.CloseSend()).To(Succeed())
 			Expect(clientCalls.Load()).To(Equal(int32(1)))

core/pkg/distribution/transport/grpc/framer/writer/transport_test.go

@@ -16,27 +16,27 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/synnaxlabs/freighter"
-	distwriter "github.com/synnaxlabs/synnax/pkg/distribution/framer/writer"
+	"github.com/synnaxlabs/synnax/pkg/distribution/framer/writer"
 	. "github.com/synnaxlabs/x/testutil"
 )
 
 var _ = Describe("Transport", func() {
 	It("Should round-trip a request over the wire", func(ctx SpecContext) {
 		transport.Server().BindHandler(func(
 			_ context.Context,
-			srv freighter.ServerStream[distwriter.Request, distwriter.Response],
+			srv freighter.ServerStream[writer.Request, writer.Response],
 		) error {
 			req, err := srv.Receive()
 			if err != nil {
 				return err
 			}
-			return srv.Send(distwriter.Response{SeqNum: 42, Command: req.Command})
+			return srv.Send(writer.Response{SeqNum: 42, Command: req.Command})
 		})
 		stream := MustSucceed(transport.Client().Stream(ctx, addr))
-		Expect(stream.Send(distwriter.Request{Command: distwriter.CommandWrite})).To(Succeed())
+		Expect(stream.Send(writer.Request{Command: writer.CommandWrite})).To(Succeed())
 		res := MustSucceed(stream.Receive())
 		Expect(res.SeqNum).To(Equal(42))
-		Expect(res.Command).To(Equal(distwriter.CommandWrite))
+		Expect(res.Command).To(Equal(writer.CommandWrite))
 		Expect(stream.CloseSend()).To(Succeed())
 	})
 
@@ -62,15 +62,15 @@ var _ = Describe("Transport", func() {
 			}))
 			transport.Server().BindHandler(func(
 				_ context.Context,
-				srv freighter.ServerStream[distwriter.Request, distwriter.Response],
+				srv freighter.ServerStream[writer.Request, writer.Response],
 			) error {
 				if _, err := srv.Receive(); err != nil {
 					return err
 				}
-				return srv.Send(distwriter.Response{})
+				return srv.Send(writer.Response{})
 			})
 			stream := MustSucceed(transport.Client().Stream(ctx, addr))
-			Expect(stream.Send(distwriter.Request{Command: distwriter.CommandWrite})).To(Succeed())
+			Expect(stream.Send(writer.Request{Command: writer.CommandWrite})).To(Succeed())
 			MustSucceed(stream.Receive())
 			Expect(stream.CloseSend()).To(Succeed())
 			Expect(clientCalls.Load()).To(Equal(int32(1)))