Fix wrong position of warm up call in resharing

Author: anhthii

pkg/eventconsumer/event_consumer.go

@@ -635,16 +635,21 @@ func (ec *eventConsumer) consumeReshareEvent() error {
 			KeyType:      msg.KeyType,
 			ResultType:   event.ResultTypeSuccess,
 		}
-
-		var wg sync.WaitGroup
 		ctx := context.Background()
+		var wg sync.WaitGroup
 		if oldSession != nil {
-			ctxOld, doneOld := context.WithCancel(ctx)
 			oldSession.Init()
 			oldSession.ListenToIncomingMessageAsync()
-			ec.warmUpSession()
-			go oldSession.Reshare(doneOld)
+		}
+		if newSession != nil {
+			newSession.Init()
+			newSession.ListenToIncomingMessageAsync()
+		}
 
+		ec.warmUpSession()
+		if oldSession != nil {
+			ctxOld, doneOld := context.WithCancel(ctx)
+			go oldSession.Reshare(doneOld)
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -655,7 +660,7 @@ func (ec *eventConsumer) consumeReshareEvent() error {
 					case err := <-oldSession.ErrChan():
 						logger.Error("Old reshare session error", err)
 						ec.handleReshareSessionError(walletID, keyType, msg.NewThreshold, err, "Old reshare session error", natMsg)
-						doneOld() // Cancel the context to stop this session
+						doneOld()
 						return
 					}
 				}
@@ -664,11 +669,7 @@ func (ec *eventConsumer) consumeReshareEvent() error {
 
 		if newSession != nil {
 			ctxNew, doneNew := context.WithCancel(ctx)
-			newSession.Init()
-			newSession.ListenToIncomingMessageAsync()
-			ec.warmUpSession()
 			go newSession.Reshare(doneNew)
-
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
@@ -680,7 +681,7 @@ func (ec *eventConsumer) consumeReshareEvent() error {
 					case err := <-newSession.ErrChan():
 						logger.Error("New reshare session error", err)
 						ec.handleReshareSessionError(walletID, keyType, msg.NewThreshold, err, "New reshare session error", natMsg)
-						doneNew() // Cancel the context to stop this session
+						doneNew()
 						return
 					}
 				}