fix: unit test sorting of covenant sigs to match expected

clientcontroller/babylon.go

@@ -158,13 +158,13 @@ func (bc *BabylonController) reliablySendMsgs(msgs []sdk.Msg) (*provider.Relayer
 
 // SubmitCovenantSigs submits the Covenant signature via a MsgAddCovenantSig to Babylon if the daemon runs in Covenant mode
 // it returns tx hash and error
-func (bc *BabylonController) SubmitCovenantSigs(covSigs []*types.CovenantSigs) (*types.TxResponse, error) {
+func (bc *BabylonController) SubmitCovenantSigs(covSigs []types.CovenantSigs) (*types.TxResponse, error) {
 	msgs := make([]sdk.Msg, 0, len(covSigs))
 	for _, covSig := range covSigs {
-		bip340UnbondingSig := bbntypes.NewBIP340SignatureFromBTCSig(covSig.UnbondingSig)
+		bip340UnbondingSig := bbntypes.NewBIP340SignatureFromBTCSig(&covSig.UnbondingSig)
 		msgs = append(msgs, &btcstakingtypes.MsgAddCovenantSigs{
 			Signer:                  bc.mustGetTxSigner(),
-			Pk:                      bbntypes.NewBIP340PubKeyFromBTCPK(covSig.PublicKey),
+			Pk:                      bbntypes.NewBIP340PubKeyFromBTCPK(&covSig.PublicKey),
 			StakingTxHash:           covSig.StakingTxHash.String(),
 			SlashingTxSigs:          covSig.SlashingSigs,
 			UnbondingTxSig:          bip340UnbondingSig,

clientcontroller/interface.go

@@ -18,7 +18,7 @@ type ClientController interface {
 	// SubmitCovenantSigs submits Covenant signatures to the consumer chain, each corresponding to
 	// a finality provider that the delegation is (re-)staked to
 	// it returns tx hash and error
-	SubmitCovenantSigs(covSigMsgs []*types.CovenantSigs) (*types.TxResponse, error)
+	SubmitCovenantSigs(covSigMsgs []types.CovenantSigs) (*types.TxResponse, error)
 
 	// QueryPendingDelegations queries BTC delegations that are in status of pending
 	QueryPendingDelegations(limit uint64) ([]*types.Delegation, error)

covenant/covenant_test.go

@@ -33,13 +33,16 @@ var net = &chaincfg.SimNetParams
 func FuzzAddCovenantSig(f *testing.F) {
 	testutil.AddRandomSeedsToFuzzer(f, 10)
 	f.Fuzz(func(t *testing.T, seed int64) {
+		t.Log("Seed", seed)
 		r := rand.New(rand.NewSource(seed))
 
 		params := testutil.GenRandomParams(r, t)
 		mockClientController := testutil.PrepareMockedClientController(t, params)
 
 		// create a Covenant key pair in the keyring
 		covenantConfig := covcfg.DefaultConfig()
+		covenantConfig.BabylonConfig.KeyDirectory = t.TempDir()
+
 		covKeyPair, err := keyring.CreateCovenantKey(
 			covenantConfig.BabylonConfig.KeyDirectory,
 			covenantConfig.BabylonConfig.ChainID,
@@ -58,7 +61,7 @@ func FuzzAddCovenantSig(f *testing.F) {
 		require.NoError(t, err)
 
 		numDels := datagen.RandomInt(r, 3) + 1
-		covSigsSet := make([]*types.CovenantSigs, 0, numDels)
+		covSigsSet := make([]types.CovenantSigs, 0, numDels)
 		btcDels := make([]*types.Delegation, 0, numDels)
 		for i := 0; uint64(i) < numDels; i++ {
 			// generate BTC delegation
@@ -176,11 +179,11 @@ func FuzzAddCovenantSig(f *testing.F) {
 				require.NoError(t, err)
 				unbondingCovSlashingSigs = append(unbondingCovSlashingSigs, covenantSig.MustMarshal())
 			}
-			covSigsSet = append(covSigsSet, &types.CovenantSigs{
-				PublicKey:             covKeyPair.PublicKey,
+			covSigsSet = append(covSigsSet, types.CovenantSigs{
+				PublicKey:             *covKeyPair.PublicKey,
 				StakingTxHash:         testInfo.StakingTx.TxHash(),
 				SlashingSigs:          covSigs,
-				UnbondingSig:          unbondingCovSig,
+				UnbondingSig:          *unbondingCovSig,
 				SlashingUnbondingSigs: unbondingCovSlashingSigs,
 			})
 		}
@@ -191,9 +194,10 @@ func FuzzAddCovenantSig(f *testing.F) {
 		}
 		btcDels = append(btcDels, invalidDelegation)
 
+		sortedCovSigs := covenant.SortCovenantSigs(covSigsSet)
 		// check the sigs are expected
 		expectedTxHash := testutil.GenRandomHexStr(r, 32)
-		mockClientController.EXPECT().SubmitCovenantSigs(covSigsSet).
+		mockClientController.EXPECT().SubmitCovenantSigs(sortedCovSigs).
 			Return(&types.TxResponse{TxHash: expectedTxHash}, nil).AnyTimes()
 		res, err := ce.AddCovenantSignatures(btcDels)
 		require.NoError(t, err)

types/sigs.go

@@ -7,9 +7,9 @@ import (
 )
 
 type CovenantSigs struct {
-	PublicKey             *btcec.PublicKey
+	PublicKey             btcec.PublicKey
 	StakingTxHash         chainhash.Hash
 	SlashingSigs          [][]byte
-	UnbondingSig          *schnorr.Signature
+	UnbondingSig          schnorr.Signature
 	SlashingUnbondingSigs [][]byte
 }