update

number571 · Nov 13, 2024 · 813bfea · 813bfea
1 parent 54aac23
commit 813bfea
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/examples/traffic_actions/keeper/client_hlt/main.go b/examples/traffic_actions/keeper/client_hlt/main.go
@@ -74,7 +74,7 @@ func main() {
 
 		netMsg := net_message.NewMessage(
 			netSett,
-			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 		)
 
 		if err := hltClient.PutMessage(ctx, netMsg); err != nil {
@@ -92,7 +92,7 @@ func main() {
 			panic(err)
 		}
 
-		if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FService {
+		if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FNetwork {
 			panic("net.payload.head is invalid")
 		}
 

diff --git a/examples/traffic_actions/keeper/prod_test/main.go b/examples/traffic_actions/keeper/prod_test/main.go
@@ -69,7 +69,7 @@ func main() {
 
 		netMsg := net_message.NewMessage(
 			netSett,
-			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 		)
 
 		start1 := time.Now()

diff --git a/examples/traffic_actions/loader/client_hll/main.go b/examples/traffic_actions/loader/client_hll/main.go
@@ -105,7 +105,7 @@ func pushMessages(ctx context.Context, netMsgSettings net_message.IConstructSett
 
 		netMsg := net_message.NewMessage(
 			netMsgSettings,
-			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 		)
 		if err := hltClient.PutMessage(ctx, netMsg); err != nil {
 			return err
@@ -150,7 +150,7 @@ func checkMessages(ctx context.Context, netMsgSettings net_message.ISettings, ms
 			return err
 		}
 
-		if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FService {
+		if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FNetwork {
 			return errors.New("network mask is invalid")
 		}
 

diff --git a/internal/helpers/encryptor/internal/handler/decrypt.go b/internal/helpers/encryptor/internal/handler/decrypt.go
@@ -48,7 +48,7 @@ func HandleMessageDecryptAPI(
 		}
 
 		netPld := netMsg.GetPayload()
-		if netPld.GetHead() != hiddenlake.GSettings.FProtoMask.FService {
+		if netPld.GetHead() != hiddenlake.GSettings.FProtoMask.FNetwork {
 			pLogger.PushWarn(logBuilder.WithMessage("invalid_net_mask"))
 			_ = api.Response(pW, http.StatusUnsupportedMediaType, "failed: invalid network mask")
 			return

diff --git a/internal/helpers/encryptor/internal/handler/decrypt_test.go b/internal/helpers/encryptor/internal/handler/decrypt_test.go
@@ -47,7 +47,7 @@ func TestHandleMessageDecryptAPI(t *testing.T) {
 		net_message.NewConstructSettings(&net_message.SConstructSettings{
 			FSettings: net_message.NewSettings(&net_message.SSettings{}),
 		}),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, encMsg),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, encMsg),
 	).ToString()
 
 	mapKeys := asymmetric.NewMapPubKeys()
@@ -92,7 +92,7 @@ func TestHandleMessageDecryptAPI(t *testing.T) {
 		net_message.NewConstructSettings(&net_message.SConstructSettings{
 			FSettings: net_message.NewSettings(&net_message.SSettings{}),
 		}),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, encMsgNotFayload),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, encMsgNotFayload),
 	).ToString()
 	if err := decryptAPIRequestOK(handler, netMsgNotPayload); err == nil {
 		t.Error("request success with invalid decrypted payload")

diff --git a/internal/helpers/encryptor/internal/handler/encrypt.go b/internal/helpers/encryptor/internal/handler/encrypt.go
@@ -74,7 +74,7 @@ func HandleMessageEncryptAPI(
 				}),
 				FParallel: pParallel,
 			}),
-			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+			payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 		)
 
 		pLogger.PushInfo(logBuilder.WithMessage(http_logger.CLogSuccess))

diff --git a/internal/helpers/loader/internal/handler/transfer_test.go b/internal/helpers/loader/internal/handler/transfer_test.go
@@ -127,7 +127,7 @@ func TestHandleTransferAPI(t *testing.T) {
 		netMsg := net_message.NewMessage(
 			netMsgSettings,
 			payload.NewPayload32(
-				hiddenlake.GSettings.FProtoMask.FService,
+				hiddenlake.GSettings.FProtoMask.FNetwork,
 				encMsg,
 			),
 		)

diff --git a/internal/helpers/traffic/internal/handler/hashes_test.go b/internal/helpers/traffic/internal/handler/hashes_test.go
@@ -143,7 +143,7 @@ func TestHandleHashesAPI(t *testing.T) {
 
 	netMsg := net_message.NewMessage(
 		testNetworkMessageSettings(),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 	)
 	if err := hltClient.PutMessage(context.Background(), netMsg); err != nil {
 		t.Error(err)

diff --git a/internal/helpers/traffic/internal/handler/message.go b/internal/helpers/traffic/internal/handler/message.go
@@ -75,7 +75,7 @@ func HandleMessageAPI(
 				return
 			}
 
-			if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FService {
+			if netMsg.GetPayload().GetHead() != hiddenlake.GSettings.FProtoMask.FNetwork {
 				pHTTPLogger.PushWarn(logBuilder.WithMessage("network_mask"))
 				_ = api.Response(pW, http.StatusLocked, "failed: network mask")
 				return

diff --git a/internal/helpers/traffic/internal/handler/message_test.go b/internal/helpers/traffic/internal/handler/message_test.go
@@ -61,7 +61,7 @@ func TestHandleMessageAPI2(t *testing.T) {
 		net_message.NewConstructSettings(&net_message.SConstructSettings{
 			FSettings: net_message.NewSettings(&net_message.SSettings{}),
 		}),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 	)
 	if err := storage.Push(netMsg); err != nil {
 		t.Error(err)
@@ -190,7 +190,7 @@ func TestHandleMessageAPI(t *testing.T) {
 
 	netMsg := net_message.NewMessage(
 		testNetworkMessageSettings(),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 	)
 	if err := hltClient.PutMessage(context.Background(), netMsg); err != nil {
 		t.Error(err)

diff --git a/internal/helpers/traffic/internal/handler/pointer_test.go b/internal/helpers/traffic/internal/handler/pointer_test.go
@@ -114,7 +114,7 @@ func TestHandlePointerAPI(t *testing.T) {
 
 	netMsg := net_message.NewMessage(
 		testNetworkMessageSettings(),
-		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FService, msg),
+		payload.NewPayload32(hiddenlake.GSettings.FProtoMask.FNetwork, msg),
 	)
 	if err := hltClient.PutMessage(context.Background(), netMsg); err != nil {
 		t.Error(err)

diff --git a/internal/helpers/traffic/pkg/app/init_network_node.go b/internal/helpers/traffic/pkg/app/init_network_node.go
@@ -28,7 +28,7 @@ func (p *sApp) initNetworkNode(pStorage storage.IMessageStorage) {
 		}),
 		cache.NewLRUCache(hiddenlake.GSettings.FNetworkManager.FCacheHashesCap),
 	).HandleFunc(
-		hiddenlake.GSettings.FProtoMask.FService,
+		hiddenlake.GSettings.FProtoMask.FNetwork,
 		handler.HandleServiceTCP(p.fConfig, pStorage, p.fAnonLogger),
 	)
 }
diff --git a/internal/service/pkg/app/app.go b/internal/service/pkg/app/app.go
@@ -77,7 +77,7 @@ func (p *sApp) Run(pCtx context.Context) error {
 		p.runListenerPPROF,
 		p.runListenerHTTP,
 		p.runListenerNode,
-		p.runNode,
+		p.runAnonymityNode,
 	}
 
 	ctx, cancel := context.WithCancel(pCtx)
@@ -208,7 +208,7 @@ func (p *sApp) runListenerNode(pCtx context.Context, wg *sync.WaitGroup, pChErr
 	<-pCtx.Done()
 }
 
-func (p *sApp) runNode(pCtx context.Context, wg *sync.WaitGroup, pChErr chan<- error) {
+func (p *sApp) runAnonymityNode(pCtx context.Context, wg *sync.WaitGroup, pChErr chan<- error) {
 	defer wg.Done()
 
 	if err := p.fNode.Run(pCtx); err != nil {