nit

Signed-off-by: Joshua Kim <[email protected]>

Author: joshua-kim

network/acp118/aggregator.go

@@ -170,13 +170,17 @@ func (s *SignatureAggregator) AggregateSignatures(
 		}
 
 		lock.Lock()
-
 		signerBitSet.Add(validator.I)
 		signatures = append(signatures, signature)
 		aggregatedStakeWeight += validator.Weight
 
 		if aggregatedStakeWeight >= stakeWeightThreshold {
 			aggregateSignature, err := bls.AggregateSignatures(signatures)
+			if err != nil {
+				done <- result{err: err}
+				lock.Unlock()
+				return
+			}
 
 			bitSetSignature := &warp.BitSetSignature{
 				Signers:   signerBitSet.Bytes(),
@@ -185,8 +189,9 @@ func (s *SignatureAggregator) AggregateSignatures(
 
 			copy(bitSetSignature.Signature[:], bls.SignatureToBytes(aggregateSignature))
 			signedMessage, err := warp.NewMessage(message, bitSetSignature)
-
 			done <- result{message: signedMessage, err: err}
+			lock.Unlock()
+			return
 		}
 
 		lock.Unlock()

network/acp118/handler_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/ava-labs/avalanchego/network/p2p"
 	"github.com/ava-labs/avalanchego/network/p2p/p2ptest"
 	"github.com/ava-labs/avalanchego/proto/pb/sdk"
-	"github.com/ava-labs/avalanchego/snow/validators/validatorstest"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
@@ -25,7 +24,7 @@ func TestHandler(t *testing.T) {
 		name           string
 		attestor       Attestor
 		expectedErr    error
-		expectedVerify error
+		expectedVerify bool
 	}{
 		{
 			name: "signature fails attestation",
@@ -45,7 +44,7 @@ func TestHandler(t *testing.T) {
 		{
 			name:           "signature attested",
 			attestor:       &testAttestor{},
-			expectedVerify: nil,
+			expectedVerify: true,
 		},
 	}
 
@@ -55,11 +54,10 @@ func TestHandler(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			require := require.New(t)
 
-			validatorState := &validatorstest.State{T: t}
-
 			ctx := context.Background()
 			sk, err := bls.NewSecretKey()
 			require.NoError(err)
+			pk := bls.PublicFromSecretKey(sk)
 			networkID := uint32(123)
 			chainID := ids.GenerateTestID()
 			signer := warp.NewSigner(sk, networkID, chainID)
@@ -101,20 +99,10 @@ func TestHandler(t *testing.T) {
 				response := &sdk.SignatureResponse{}
 				require.NoError(proto.Unmarshal(responseBytes, response))
 
-				parsed, err := warp.ParseMessage(response.Signature)
+				signature, err := bls.SignatureFromBytes(response.Signature)
 				require.NoError(err)
 
-				require.ErrorIs(tt.expectedVerify, parsed.Signature.Verify(
-					ctx,
-					&parsed.UnsignedMessage,
-					networkID,
-					validatorState,
-					0,
-					0,
-					1,
-				))
-
-				//require.Equal(tt.expectedVerify, bls.Verify(pk, parsed.Signature, request.Message))
+				require.Equal(tt.expectedVerify, bls.Verify(pk, signature, request.Message))
 			}
 
 			require.NoError(c.AppRequest(ctx, set.Of(serverNodeID), requestBytes, onResponse))