update

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 *??? ??, ????*
 
+### CHANGES
+
+- `pkg/client/message,pkg/network/message`: move to pkg/message/layer2,pkg/message/layer1
+
 <!-- ... -->
 
 ## v1.7.9

pkg/anonymity/adapters/adapter.go

@@ -3,16 +3,16 @@ package adapters
 import (
 	"context"
 
-	net_message "github.com/number571/go-peer/pkg/network/message"
+	"github.com/number571/go-peer/pkg/message/layer1"
 )
 
 var (
 	_ IAdapter = &sAdapter{}
 )
 
 type (
-	iProducerF func(context.Context, net_message.IMessage) error
-	iConsumerF func(context.Context) (net_message.IMessage, error)
+	iProducerF func(context.Context, layer1.IMessage) error
+	iConsumerF func(context.Context) (layer1.IMessage, error)
 )
 
 type sAdapter struct {
@@ -27,10 +27,10 @@ func NewAdapterByFuncs(pProduce iProducerF, pConsume iConsumerF) IAdapter {
 	}
 }
 
-func (p *sAdapter) Produce(pCtx context.Context, pMsg net_message.IMessage) error {
+func (p *sAdapter) Produce(pCtx context.Context, pMsg layer1.IMessage) error {
 	return p.fProduce(pCtx, pMsg)
 }
 
-func (p *sAdapter) Consume(pCtx context.Context) (net_message.IMessage, error) {
+func (p *sAdapter) Consume(pCtx context.Context) (layer1.IMessage, error) {
 	return p.fConsume(pCtx)
 }

pkg/anonymity/adapters/adapters_test.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/number571/go-peer/pkg/network/message"
+	"github.com/number571/go-peer/pkg/message/layer1"
 	"github.com/number571/go-peer/pkg/payload"
 )
 
@@ -14,22 +14,22 @@ const (
 )
 
 func TestAdapter(t *testing.T) {
-	msgChan := make(chan message.IMessage, 1)
+	msgChan := make(chan layer1.IMessage, 1)
 	adapter := NewAdapterByFuncs(
-		func(_ context.Context, msg message.IMessage) error {
+		func(_ context.Context, msg layer1.IMessage) error {
 			msgChan <- msg
 			return nil
 		},
-		func(_ context.Context) (message.IMessage, error) {
+		func(_ context.Context) (layer1.IMessage, error) {
 			return <-msgChan, nil
 		},
 	)
 
 	ctx := context.Background()
 
-	err := adapter.Produce(ctx, message.NewMessage(
-		message.NewConstructSettings(&message.SConstructSettings{
-			FSettings: message.NewSettings(&message.SSettings{}),
+	err := adapter.Produce(ctx, layer1.NewMessage(
+		layer1.NewConstructSettings(&layer1.SConstructSettings{
+			FSettings: layer1.NewSettings(&layer1.SSettings{}),
 		}),
 		payload.NewPayload32(0x01, []byte(tcMessage)),
 	))

pkg/anonymity/adapters/types.go

@@ -3,7 +3,7 @@ package adapters
 import (
 	"context"
 
-	net_message "github.com/number571/go-peer/pkg/network/message"
+	"github.com/number571/go-peer/pkg/message/layer1"
 )
 
 type IAdapter interface {
@@ -12,9 +12,9 @@ type IAdapter interface {
 }
 
 type IProducer interface {
-	Produce(context.Context, net_message.IMessage) error
+	Produce(context.Context, layer1.IMessage) error
 }
 
 type IConsumer interface {
-	Consume(context.Context) (net_message.IMessage, error)
+	Consume(context.Context) (layer1.IMessage, error)
 }

pkg/anonymity/anonymity.go

@@ -9,17 +9,17 @@ import (
 
 	"github.com/number571/go-peer/pkg/anonymity/adapters"
 	"github.com/number571/go-peer/pkg/anonymity/queue"
-	"github.com/number571/go-peer/pkg/client/message"
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/crypto/hashing"
 	"github.com/number571/go-peer/pkg/crypto/random"
 	"github.com/number571/go-peer/pkg/logger"
+	"github.com/number571/go-peer/pkg/message/layer1"
+	"github.com/number571/go-peer/pkg/message/layer2"
 	"github.com/number571/go-peer/pkg/payload"
 	"github.com/number571/go-peer/pkg/state"
 	"github.com/number571/go-peer/pkg/storage/database"
 
 	anon_logger "github.com/number571/go-peer/pkg/anonymity/logger"
-	net_message "github.com/number571/go-peer/pkg/network/message"
 )
 
 var (
@@ -225,7 +225,7 @@ func (p *sNode) recvResponse(pCtx context.Context, pActionKey string) ([]byte, e
 	}
 }
 
-func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg net_message.IMessage) error {
+func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg layer1.IMessage) error {
 	logBuilder := anon_logger.NewLogBuilder(p.fSettings.GetServiceName())
 
 	// update logger state
@@ -235,7 +235,7 @@ func (p *sNode) consumeMessage(pCtx context.Context, pNetMsg net_message.IMessag
 	encMsg := pNetMsg.GetPayload().GetBody()
 
 	// load encrypted message without decryption try
-	if _, err := message.LoadMessage(client.GetMessageSize(), encMsg); err != nil {
+	if _, err := layer2.LoadMessage(client.GetMessageSize(), encMsg); err != nil {
 		// problem from sender's side
 		p.fLogger.PushWarn(logBuilder.WithType(anon_logger.CLogWarnMessageNull))
 		return errors.Join(ErrLoadMessage, err)
@@ -377,7 +377,7 @@ func (p *sNode) enqueuePayload(
 	return nil
 }
 
-func (p *sNode) enrichLogger(pLogBuilder anon_logger.ILogBuilder, pNetMsg net_message.IMessage) anon_logger.ILogBuilder {
+func (p *sNode) enrichLogger(pLogBuilder anon_logger.ILogBuilder, pNetMsg layer1.IMessage) anon_logger.ILogBuilder {
 	var (
 		size  = len(pNetMsg.ToBytes())
 		hash  = pNetMsg.GetHash()
@@ -391,7 +391,7 @@ func (p *sNode) enrichLogger(pLogBuilder anon_logger.ILogBuilder, pNetMsg net_me
 
 func (p *sNode) produceMessage(
 	pCtx context.Context,
-	pNetMsg net_message.IMessage,
+	pNetMsg layer1.IMessage,
 ) (bool, error) {
 	serviceName := p.fSettings.GetServiceName()
 

pkg/anonymity/anonymity_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/number571/go-peer/pkg/crypto/random"
 	"github.com/number571/go-peer/pkg/encoding"
 	"github.com/number571/go-peer/pkg/logger"
+	"github.com/number571/go-peer/pkg/message/layer1"
 	"github.com/number571/go-peer/pkg/network"
 	"github.com/number571/go-peer/pkg/payload"
 	"github.com/number571/go-peer/pkg/storage/cache"
@@ -27,7 +28,6 @@ import (
 
 	anon_logger "github.com/number571/go-peer/pkg/anonymity/logger"
 	"github.com/number571/go-peer/pkg/network/conn"
-	net_message "github.com/number571/go-peer/pkg/network/message"
 )
 
 const (
@@ -345,8 +345,8 @@ func TestHandleWrapper(t *testing.T) {
 	pubKey := privKey.GetPubKey()
 	node.GetMapPubKeys().SetPubKey(privKey.GetPubKey())
 
-	sett := net_message.NewConstructSettings(&net_message.SConstructSettings{
-		FSettings: net_message.NewSettings(&net_message.SSettings{}),
+	sett := layer1.NewConstructSettings(&layer1.SConstructSettings{
+		FSettings: layer1.NewSettings(&layer1.SSettings{}),
 	})
 
 	msg, err := client.EncryptMessage(
@@ -483,8 +483,8 @@ func TestStoreHashWithBroadcastMessage(t *testing.T) {
 		return
 	}
 
-	sett := net_message.NewConstructSettings(&net_message.SConstructSettings{
-		FSettings: net_message.NewSettings(&net_message.SSettings{}),
+	sett := layer1.NewConstructSettings(&layer1.SConstructSettings{
+		FSettings: layer1.NewSettings(&layer1.SSettings{}),
 	})
 
 	netMsg := node.testNewNetworkMessage(sett, msg)
@@ -675,7 +675,7 @@ func (p *stLogging) HasErro() bool {
 */
 
 func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string, db database.IKVDatabase) (INode, network.INode) {
-	msgChan := make(chan net_message.IMessage)
+	msgChan := make(chan layer1.IMessage)
 	parallel := uint64(1)
 	networkMask := uint32(1)
 	limitVoidSize := uint64(10_000)
@@ -686,7 +686,7 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string,
 			FReadTimeout:  timeWait,
 			FWriteTimeout: timeWait,
 			FConnSettings: conn.NewSettings(&conn.SSettings{
-				FMessageSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageSettings: layer1.NewSettings(&layer1.SSettings{
 					FWorkSizeBits: tcWorkSize,
 				}),
 				FLimitMessageSizeBytes: tcMsgSize + limitVoidSize,
@@ -697,7 +697,7 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string,
 			}),
 		}),
 		cache.NewLRUCache(1024),
-	).HandleFunc(networkMask, func(_ context.Context, _ network.INode, _ conn.IConn, msg net_message.IMessage) error {
+	).HandleFunc(networkMask, func(_ context.Context, _ network.INode, _ conn.IConn, msg layer1.IMessage) error {
 		msgChan <- msg
 		return nil
 	})
@@ -712,10 +712,10 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string,
 			func(_ logger.ILogArg) string { return "" },
 		),
 		adapters.NewAdapterByFuncs(
-			func(ctx context.Context, msg net_message.IMessage) error {
+			func(ctx context.Context, msg layer1.IMessage) error {
 				return networkNode.BroadcastMessage(ctx, msg)
 			},
-			func(ctx context.Context) (net_message.IMessage, error) {
+			func(ctx context.Context) (layer1.IMessage, error) {
 				select {
 				case <-ctx.Done():
 					return nil, ctx.Err()
@@ -728,8 +728,8 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string,
 		db,
 		queue.NewQBProblemProcessor(
 			queue.NewSettings(&queue.SSettings{
-				FMessageConstructSettings: net_message.NewConstructSettings(&net_message.SConstructSettings{
-					FSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageConstructSettings: layer1.NewConstructSettings(&layer1.SConstructSettings{
+					FSettings: layer1.NewSettings(&layer1.SSettings{
 						FWorkSizeBits: tcWorkSize,
 					}),
 					FParallel: parallel,
@@ -770,8 +770,8 @@ func testDeleteDB(typeDB int) {
 	}
 }
 
-func (p *sNode) testNewNetworkMessage(pSett net_message.IConstructSettings, pMsgBytes []byte) net_message.IMessage {
-	return net_message.NewMessage(
+func (p *sNode) testNewNetworkMessage(pSett layer1.IConstructSettings, pMsgBytes []byte) layer1.IMessage {
+	return layer1.NewMessage(
 		pSett,
 		payload.NewPayload32(
 			p.fQBProcessor.GetSettings().GetNetworkMask(),

pkg/anonymity/examples/echo/construct.go

@@ -13,9 +13,9 @@ import (
 	"github.com/number571/go-peer/pkg/client"
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/logger"
+	"github.com/number571/go-peer/pkg/message/layer1"
 	"github.com/number571/go-peer/pkg/network"
 	"github.com/number571/go-peer/pkg/network/conn"
-	net_message "github.com/number571/go-peer/pkg/network/message"
 	"github.com/number571/go-peer/pkg/storage/cache"
 	"github.com/number571/go-peer/pkg/storage/database"
 )
@@ -29,15 +29,15 @@ const (
 )
 
 func newNode(serviceName, address string) (network.INode, anonymity.INode) {
-	msgChan := make(chan net_message.IMessage)
+	msgChan := make(chan layer1.IMessage)
 	networkNode := network.NewNode(
 		network.NewSettings(&network.SSettings{
 			FAddress:      address,
 			FMaxConnects:  256,
 			FReadTimeout:  time.Minute,
 			FWriteTimeout: time.Minute,
 			FConnSettings: conn.NewSettings(&conn.SSettings{
-				FMessageSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageSettings: layer1.NewSettings(&layer1.SSettings{
 					FWorkSizeBits: workSize,
 				}),
 				FLimitMessageSizeBytes: msgSize,
@@ -50,7 +50,7 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 		cache.NewLRUCache(1024),
 	).HandleFunc(
 		networkMask,
-		func(ctx context.Context, _ network.INode, _ conn.IConn, msg net_message.IMessage) error {
+		func(ctx context.Context, _ network.INode, _ conn.IConn, msg layer1.IMessage) error {
 			msgChan <- msg
 			return nil
 		},
@@ -82,10 +82,10 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 			},
 		),
 		adapters.NewAdapterByFuncs(
-			func(ctx context.Context, msg net_message.IMessage) error {
+			func(ctx context.Context, msg layer1.IMessage) error {
 				return networkNode.BroadcastMessage(ctx, msg)
 			},
-			func(ctx context.Context) (net_message.IMessage, error) {
+			func(ctx context.Context) (layer1.IMessage, error) {
 				select {
 				case <-ctx.Done():
 					return nil, ctx.Err()
@@ -104,8 +104,8 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 		}(),
 		queue.NewQBProblemProcessor(
 			queue.NewSettings(&queue.SSettings{
-				FMessageConstructSettings: net_message.NewConstructSettings(&net_message.SConstructSettings{
-					FSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageConstructSettings: layer1.NewConstructSettings(&layer1.SConstructSettings{
+					FSettings: layer1.NewSettings(&layer1.SSettings{
 						FWorkSizeBits: workSize,
 					}),
 				}),

pkg/anonymity/examples/ping-pong/construct.go

@@ -13,9 +13,9 @@ import (
 	"github.com/number571/go-peer/pkg/client"
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/logger"
+	"github.com/number571/go-peer/pkg/message/layer1"
 	"github.com/number571/go-peer/pkg/network"
 	"github.com/number571/go-peer/pkg/network/conn"
-	net_message "github.com/number571/go-peer/pkg/network/message"
 	"github.com/number571/go-peer/pkg/storage/cache"
 	"github.com/number571/go-peer/pkg/storage/database"
 )
@@ -29,15 +29,15 @@ const (
 )
 
 func newNode(serviceName, address string) (network.INode, anonymity.INode) {
-	msgChan := make(chan net_message.IMessage)
+	msgChan := make(chan layer1.IMessage)
 	networkNode := network.NewNode(
 		network.NewSettings(&network.SSettings{
 			FAddress:      address,
 			FMaxConnects:  256,
 			FReadTimeout:  time.Minute,
 			FWriteTimeout: time.Minute,
 			FConnSettings: conn.NewSettings(&conn.SSettings{
-				FMessageSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageSettings: layer1.NewSettings(&layer1.SSettings{
 					FWorkSizeBits: workSize,
 				}),
 				FLimitMessageSizeBytes: msgSize,
@@ -50,7 +50,7 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 		cache.NewLRUCache(1024),
 	).HandleFunc(
 		networkMask,
-		func(ctx context.Context, _ network.INode, _ conn.IConn, msg net_message.IMessage) error {
+		func(ctx context.Context, _ network.INode, _ conn.IConn, msg layer1.IMessage) error {
 			msgChan <- msg
 			return nil
 		},
@@ -82,10 +82,10 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 			},
 		),
 		adapters.NewAdapterByFuncs(
-			func(ctx context.Context, msg net_message.IMessage) error {
+			func(ctx context.Context, msg layer1.IMessage) error {
 				return networkNode.BroadcastMessage(ctx, msg)
 			},
-			func(ctx context.Context) (net_message.IMessage, error) {
+			func(ctx context.Context) (layer1.IMessage, error) {
 				select {
 				case <-ctx.Done():
 					return nil, ctx.Err()
@@ -104,8 +104,8 @@ func newNode(serviceName, address string) (network.INode, anonymity.INode) {
 		}(),
 		queue.NewQBProblemProcessor(
 			queue.NewSettings(&queue.SSettings{
-				FMessageConstructSettings: net_message.NewConstructSettings(&net_message.SConstructSettings{
-					FSettings: net_message.NewSettings(&net_message.SSettings{
+				FMessageConstructSettings: layer1.NewConstructSettings(&layer1.SConstructSettings{
+					FSettings: layer1.NewSettings(&layer1.SSettings{
 						FWorkSizeBits: workSize,
 					}),
 				}),