update

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 *??? ??, ????*
 
+### CHANGES
+
+- Update `pkg/network/anonymity/queue`: deleted key auto generation -> add param pReceiver
+
 <!-- ... -->
 
 ## v1.6.18

cmd/hidden_lake/service/internal/handler/handler_test.go

@@ -222,6 +222,7 @@ func testNewNode(dbPath, addr string) anonymity.INode {
 				}),
 				asymmetric.LoadRSAPrivKey(testutils.Tc1PrivKey1024),
 			),
+			asymmetric.NewRSAPrivKey(testutils.TcKeySize).GetPubKey(),
 		),
 		asymmetric.NewListPubKeys(),
 	)

cmd/hidden_lake/service/pkg/app/init_anon_node.go

@@ -92,6 +92,7 @@ func (p *sApp) initAnonNode() error {
 				FNetworkKey: cfgSettings.GetNetworkKey(),
 			}),
 			client,
+			asymmetric.NewRSAPrivKey(client.GetPrivKey().GetSize()).GetPubKey(),
 		),
 		func() asymmetric.IListPubKeys {
 			f2f := asymmetric.NewListPubKeys()

pkg/network/anonymity/anonymity_test.go

@@ -728,6 +728,7 @@ func testNewNode(timeWait time.Duration, addr string, typeDB, numDB int, f2fDisa
 				}),
 				asymmetric.LoadRSAPrivKey(testutils.Tc1PrivKey1024),
 			),
+			asymmetric.NewRSAPrivKey(testutils.TcKeySize).GetPubKey(),
 		),
 		asymmetric.NewListPubKeys(),
 	)

pkg/network/anonymity/examples/echo/construct.go

@@ -91,6 +91,7 @@ func newNode(serviceName, address string) anonymity.INode {
 				}),
 				asymmetric.NewRSAPrivKey(keySize),
 			),
+			asymmetric.NewRSAPrivKey(keySize).GetPubKey(),
 		),
 		asymmetric.NewListPubKeys(),
 	)

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

@@ -91,6 +91,7 @@ func newNode(serviceName, address string) anonymity.INode {
 				}),
 				asymmetric.NewRSAPrivKey(keySize),
 			),
+			asymmetric.NewRSAPrivKey(keySize).GetPubKey(),
 		),
 		asymmetric.NewListPubKeys(),
 	)

pkg/network/anonymity/queue/examples/queue/main.go

@@ -33,6 +33,7 @@ func main() {
 			}),
 			asymmetric.NewRSAPrivKey(1024),
 		),
+		asymmetric.NewRSAPrivKey(1024).GetPubKey(),
 	)
 
 	ctx, cancel := context.WithCancel(context.Background())

pkg/network/anonymity/queue/queue.go

@@ -49,8 +49,14 @@ func NewMessageQueueProcessor(
 	pSettings ISettings,
 	pVSettings IVSettings,
 	pClient client.IClient,
+	pReceiver asymmetric.IPubKey,
 ) IMessageQueueProcessor {
-	mq := &sMessageQueueProcessor{
+	if pSettings.GetQueuePeriod() != 0 {
+		if pClient.GetPubKey().GetSize() != pReceiver.GetSize() {
+			panic("pClient.GetPubKey().GetSize() != pReceiver.GetSize()")
+		}
+	}
+	return &sMessageQueueProcessor{
 		fState:     state.NewBoolState(),
 		fSettings:  pSettings,
 		fVSettings: pVSettings,
@@ -59,14 +65,11 @@ func NewMessageQueueProcessor(
 			fQueue:    make(chan net_message.IMessage, pSettings.GetMainPoolCapacity()),
 			fRawQueue: make(chan []byte, pSettings.GetMainPoolCapacity()),
 		},
-	}
-	if pSettings.GetQueuePeriod() != 0 { // if QB=true
-		mq.fRandPool = &sRandPool{
+		fRandPool: &sRandPool{
 			fQueue:    make(chan net_message.IMessage, pSettings.GetRandPoolCapacity()),
-			fReceiver: asymmetric.NewRSAPrivKey(pClient.GetPrivKey().GetSize()).GetPubKey(),
-		}
+			fReceiver: pReceiver,
+		},
 	}
-	return mq
 }
 
 func (p *sMessageQueueProcessor) GetSettings() ISettings {
@@ -109,7 +112,7 @@ func (p *sMessageQueueProcessor) Run(pCtx context.Context) error {
 func (p *sMessageQueueProcessor) runRandPoolFiller(pCtx context.Context, pWg *sync.WaitGroup, chErr chan<- error) {
 	defer pWg.Done()
 
-	if p.fRandPool == nil {
+	if p.fSettings.GetQueuePeriod() == 0 { // if QB=false
 		<-pCtx.Done()
 		chErr <- pCtx.Err()
 		return
@@ -158,7 +161,7 @@ func (p *sMessageQueueProcessor) SetVSettings(pVSettings IVSettings) {
 		<-p.fMainPool.fQueue
 	}
 
-	if p.fRandPool != nil {
+	if p.fSettings.GetQueuePeriod() != 0 { // if QB=true
 		for len(p.fRandPool.fQueue) > 0 {
 			atomic.AddInt64(&p.fRandPool.fCount, -1)
 			<-p.fRandPool.fQueue
@@ -182,7 +185,7 @@ func (p *sMessageQueueProcessor) EnqueueMessage(pPubKey asymmetric.IPubKey, pByt
 }
 
 func (p *sMessageQueueProcessor) DequeueMessage(pCtx context.Context) net_message.IMessage {
-	if p.fRandPool == nil {
+	if p.fSettings.GetQueuePeriod() == 0 { // if QB=false
 		select {
 		case <-pCtx.Done():
 			return nil

pkg/network/anonymity/queue/queue_test.go

@@ -79,6 +79,7 @@ func TestQueueVoidDisabled(t *testing.T) {
 			}),
 			asymmetric.LoadRSAPrivKey(testutils.Tc1PrivKey1024),
 		),
+		asymmetric.NewRSAPrivKey(testutils.TcKeySize).GetPubKey(),
 	)
 
 	if err := testQueue(queue); err != nil {
@@ -106,6 +107,7 @@ func TestRunStopQueue(t *testing.T) {
 		}),
 		NewVSettings(&SVSettings{}),
 		client,
+		asymmetric.NewRSAPrivKey(client.GetPrivKey().GetSize()).GetPubKey(),
 	)
 
 	ctx1, cancel1 := context.WithCancel(context.Background())
@@ -183,6 +185,7 @@ func TestQueue(t *testing.T) {
 			}),
 			asymmetric.LoadRSAPrivKey(testutils.Tc1PrivKey1024),
 		),
+		asymmetric.NewRSAPrivKey(testutils.TcKeySize).GetPubKey(),
 	)
 
 	sett := queue.GetSettings()