fixes

Author: louisinger

server/internal/core/application/service.go

@@ -1763,7 +1763,9 @@ func (s *covenantlessService) startFinalization(roundTiming roundTiming, request
 	thirdOfRemainingDuration := roundTiming.finalizationDuration()
 
 	defer func() {
-		s.liveStore.TreeSigingSessions().Delete(roundId)
+		if err := s.liveStore.TreeSigingSessions().Delete(roundId); err != nil {
+			log.WithError(err).Warn("failed to delete tree signing session")
+		}
 
 		if err := s.saveEvents(ctx, roundId, s.liveStore.CurrentRound().Get().Events()); err != nil {
 			log.WithError(err).Warn("failed to store new round events")

server/internal/core/ports/live_store.go

@@ -67,7 +67,7 @@ type ConfirmationSessionsStore interface {
 type TreeSigningSessionsStore interface {
 	New(roundId string, uniqueSignersPubKeys map[string]struct{}) *MusigSigningSession
 	Get(roundId string) (*MusigSigningSession, bool)
-	Delete(roundId string)
+	Delete(roundId string) error
 	AddNonces(ctx context.Context, roundId string, pubkey string, nonces tree.TreeNonces) error
 	AddSignatures(ctx context.Context, roundId string, pubkey string, nonces tree.TreePartialSigs) error
 	NoncesCollected(roundId string) <-chan struct{}

server/internal/infrastructure/live-store/inmemory/tree_signing_session.go

@@ -49,20 +49,25 @@ func (s *treeSigningSessionsStore) Get(roundId string) (*ports.MusigSigningSessi
 	sess, ok := s.sessions[roundId]
 	return sess, ok
 }
-func (s *treeSigningSessionsStore) Delete(roundId string) {
+func (s *treeSigningSessionsStore) Delete(roundId string) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 
-	if ch, exists := s.nonceCollectedCh[roundId]; exists {
-		close(ch)
+	if _, exists := s.nonceCollectedCh[roundId]; !exists {
+		return fmt.Errorf(`nonce collected channel not found for round "%s"`, roundId)
 	}
-	if ch, exists := s.sigsCollectedCh[roundId]; exists {
-		close(ch)
+	if _, exists := s.sigsCollectedCh[roundId]; !exists {
+		return fmt.Errorf(`signatures collected channel not found for round "%s"`, roundId)
 	}
 
+	close(s.nonceCollectedCh[roundId])
+	close(s.sigsCollectedCh[roundId])
+
 	delete(s.nonceCollectedCh, roundId)
 	delete(s.sigsCollectedCh, roundId)
 	delete(s.sessions, roundId)
+
+	return nil
 }
 
 func (s *treeSigningSessionsStore) AddNonces(
@@ -122,19 +127,9 @@ func (s *treeSigningSessionsStore) AddSignatures(
 }
 
 func (s *treeSigningSessionsStore) NoncesCollected(roundId string) <-chan struct{} {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
-	if ch, exists := s.nonceCollectedCh[roundId]; exists {
-		return ch
-	}
-	return nil
+	return s.nonceCollectedCh[roundId]
 }
 
 func (s *treeSigningSessionsStore) SignaturesCollected(roundId string) <-chan struct{} {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
-	if ch, exists := s.sigsCollectedCh[roundId]; exists {
-		return ch
-	}
-	return nil
+	return s.sigsCollectedCh[roundId]
 }

server/internal/infrastructure/live-store/live_store_test.go

@@ -308,7 +308,8 @@ func runLiveStoreTests(t *testing.T, store ports.LiveStore) {
 		}
 
 		// Delete
-		store.TreeSigingSessions().Delete(roundId)
+		err = store.TreeSigingSessions().Delete(roundId)
+		require.NoError(t, err)
 
 		// Get
 		sigSession, exists := store.TreeSigingSessions().Get(roundId)

server/internal/infrastructure/live-store/redis/tree_signing_session.go

@@ -10,10 +10,11 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/ark-network/ark/common/tree"
 	"github.com/ark-network/ark/server/internal/core/ports"
 	"github.com/redis/go-redis/v9"
@@ -113,7 +114,7 @@ func (s *treeSigningSessionsStore) Get(roundId string) (*ports.MusigSigningSessi
 	return sess, true
 }
 
-func (s *treeSigningSessionsStore) Delete(roundId string) {
+func (s *treeSigningSessionsStore) Delete(roundId string) error {
 	ctx := context.Background()
 	metaKey := fmt.Sprintf(treeSessMetaKeyFmt, roundId)
 	noncesKey := fmt.Sprintf(treeSessNoncesKeyFmt, roundId)
@@ -127,6 +128,7 @@ func (s *treeSigningSessionsStore) Delete(roundId string) {
 		close(s.sigsCh)
 		s.sigsCh = nil
 	}
+	return nil
 }
 
 func (s *treeSigningSessionsStore) AddNonces(ctx context.Context, roundId string, pubkey string, nonces tree.TreeNonces) error {