Straglers

ava-labs · Nov 27, 2024 · fd5e553 · fd5e553
1 parent 72e2bba
commit fd5e553
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 49 deletions.
diff --git a/utils/crypto/bls/bls_benchmark_test.go b/utils/crypto/bls/bls_benchmark_test.go
@@ -53,7 +53,7 @@ func BenchmarkSign(b *testing.B) {
 func BenchmarkVerify(b *testing.B) {
 	privateKey, err := NewSigner()
 	require.NoError(b, err)
-	publicKey := PublicKey(privateKey)
+	publicKey := privateKey.PublicKey()
 
 	for _, messageSize := range sizes {
 		b.Run(strconv.Itoa(messageSize), func(b *testing.B) {
@@ -75,7 +75,7 @@ func BenchmarkAggregatePublicKeys(b *testing.B) {
 		privateKey, err := NewSigner()
 		require.NoError(b, err)
 
-		keys[i] = PublicKey(privateKey)
+		keys[i] = privateKey.PublicKey()
 	}
 
 	for _, size := range sizes {
@@ -92,7 +92,7 @@ func BenchmarkPublicKeyToCompressedBytes(b *testing.B) {
 	sk, err := NewSigner()
 	require.NoError(b, err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 
 	b.ResetTimer()
 	for range b.N {
@@ -104,7 +104,7 @@ func BenchmarkPublicKeyFromCompressedBytes(b *testing.B) {
 	sk, err := NewSigner()
 	require.NoError(b, err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 	pkBytes := PublicKeyToCompressedBytes(pk)
 
 	b.ResetTimer()
@@ -117,7 +117,7 @@ func BenchmarkPublicKeyToUncompressedBytes(b *testing.B) {
 	sk, err := NewSigner()
 	require.NoError(b, err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 
 	b.ResetTimer()
 	for range b.N {
@@ -129,7 +129,7 @@ func BenchmarkPublicKeyFromValidUncompressedBytes(b *testing.B) {
 	sk, err := NewSigner()
 	require.NoError(b, err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 	pkBytes := PublicKeyToUncompressedBytes(pk)
 
 	b.ResetTimer()

diff --git a/utils/crypto/bls/bls_test.go b/utils/crypto/bls/bls_test.go
@@ -32,9 +32,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk2),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk2.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -56,7 +56,7 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk),
+					sk.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -80,9 +80,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk2),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk2.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -110,9 +110,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk2),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk2.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -141,9 +141,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk3),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk3.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -169,9 +169,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk2),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk2.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -196,8 +196,8 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -246,9 +246,9 @@ func TestAggregation(t *testing.T) {
 				require.NoError(err)
 
 				pks := []*PublicKey{
-					PublicKey(sk0),
-					PublicKey(sk1),
-					PublicKey(sk2),
+					sk0.PublicKey(),
+					sk1.PublicKey(),
+					sk2.PublicKey(),
 				}
 
 				msg := utils.RandomBytes(1234)
@@ -290,9 +290,9 @@ func TestAggregationThreshold(t *testing.T) {
 
 	// All the public keys would be registered on chain
 	pks := []*PublicKey{
-		PublicKey(sk0),
-		PublicKey(sk1),
-		PublicKey(sk2),
+		sk0.PublicKey(),
+		sk1.PublicKey(),
+		sk2.PublicKey(),
 	}
 
 	// The transaction's unsigned bytes are publicly known.
@@ -350,7 +350,7 @@ func TestVerify(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 				sig := sk.Sign(msg)
 				return pk, sig, msg
@@ -362,7 +362,7 @@ func TestVerify(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 				sig := sk.Sign(msg)
 				msg[0]++
@@ -380,7 +380,7 @@ func TestVerify(t *testing.T) {
 
 				sk2, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk2)
+				pk := sk2.PublicKey()
 				return pk, sig, msg
 			},
 			expectedValid: false,
@@ -390,7 +390,7 @@ func TestVerify(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 
 				msg2 := utils.RandomBytes(1234)
@@ -426,7 +426,7 @@ func TestVerifyProofOfPossession(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 				sig := sk.SignProofOfPossession(msg)
 				return pk, sig, msg
@@ -438,7 +438,7 @@ func TestVerifyProofOfPossession(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 				sig := sk.SignProofOfPossession(msg)
 				msg[0]++
@@ -456,7 +456,7 @@ func TestVerifyProofOfPossession(t *testing.T) {
 
 				sk2, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk2)
+				pk := sk2.PublicKey()
 				return pk, sig, msg
 			},
 			expectedValid: false,
@@ -466,7 +466,7 @@ func TestVerifyProofOfPossession(t *testing.T) {
 			setup: func(require *require.Assertions) (*PublicKey, *Signature, []byte) {
 				sk, err := NewSigner()
 				require.NoError(err)
-				pk := PublicKey(sk)
+				pk := sk.PublicKey()
 				msg := utils.RandomBytes(1234)
 
 				msg2 := utils.RandomBytes(1234)

diff --git a/utils/crypto/bls/public_test.go b/utils/crypto/bls/public_test.go
@@ -25,7 +25,7 @@ func TestPublicKeyBytes(t *testing.T) {
 	sk, err := NewSigner()
 	require.NoError(err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 	pkBytes := PublicKeyToCompressedBytes(pk)
 
 	pk2, err := PublicKeyFromCompressedBytes(pkBytes)
@@ -42,7 +42,7 @@ func TestAggregatePublicKeysNoop(t *testing.T) {
 	sk, err := NewSigner()
 	require.NoError(err)
 
-	pk := PublicKey(sk)
+	pk := sk.PublicKey()
 	pkBytes := PublicKeyToCompressedBytes(pk)
 
 	aggPK, err := AggregatePublicKeys([]*PublicKey{pk})

diff --git a/utils/crypto/bls/secret_test.go b/utils/crypto/bls/secret_test.go
@@ -36,12 +36,12 @@ func TestSecretKeyBytes(t *testing.T) {
 	sk, err := NewSigner()
 	require.NoError(err)
 	sig := sk.Sign(msg)
-	skBytes := ToBytes(sk)
+	skBytes := sk.ToBytes()
 
 	sk2, err := SecretKeyFromBytes(skBytes)
 	require.NoError(err)
 	sig2 := sk2.Sign(msg)
-	sk2Bytes := ToBytes(sk2)
+	sk2Bytes := sk2.ToBytes()
 
 	require.Equal(sk, sk2)
 	require.Equal(skBytes, sk2Bytes)

diff --git a/vms/platformvm/network/warp_test.go b/vms/platformvm/network/warp_test.go
@@ -185,7 +185,7 @@ func TestSignatureRequestVerifyL1ValidatorRegistrationRegistered(t *testing.T) {
 			ValidationID: ids.GenerateTestID(),
 			SubnetID:     ids.GenerateTestID(),
 			NodeID:       ids.GenerateTestNodeID(),
-			PublicKey:    bls.PublicKeyToUncompressedBytes(sk).PublicKey(),
+			PublicKey:    bls.PublicKeyToUncompressedBytes(sk.PublicKey()),
 			Weight:       1,
 		}
 		state = statetest.New(t, statetest.Config{})
@@ -556,7 +556,7 @@ func TestSignatureRequestVerifyL1ValidatorWeight(t *testing.T) {
 			ValidationID: ids.GenerateTestID(),
 			SubnetID:     ids.GenerateTestID(),
 			NodeID:       ids.GenerateTestNodeID(),
-			PublicKey:    bls.PublicKeyToUncompressedBytes(sk).PublicKey(),
+			PublicKey:    bls.PublicKeyToUncompressedBytes(sk.PublicKey()),
 			Weight:       weight,
 			MinNonce:     nonce + 1,
 		}

diff --git a/vms/platformvm/txs/executor/standard_tx_executor_test.go b/vms/platformvm/txs/executor/standard_tx_executor_test.go
@@ -2653,7 +2653,7 @@ func TestStandardExecutorConvertSubnetToL1Tx(t *testing.T) {
 
 			var (
 				validationID = subnetID.Append(0)
-				pkBytes      = bls.PublicKeyToUncompressedBytes(sk).PublicKey()
+				pkBytes      = bls.PublicKeyToUncompressedBytes(sk.PublicKey())
 			)
 			remainingBalanceOwner, err := txs.Codec.Marshal(txs.CodecVersion, &validator.RemainingBalanceOwner)
 			require.NoError(err)
@@ -3100,7 +3100,7 @@ func TestStandardExecutorRegisterL1ValidatorTx(t *testing.T) {
 					ValidationID: ids.GenerateTestID(),
 					SubnetID:     subnetID,
 					NodeID:       nodeID,
-					PublicKey:    bls.PublicKeyToUncompressedBytes(initialSK).PublicKey(),
+					PublicKey:    bls.PublicKeyToUncompressedBytes(initialSK.PublicKey()),
 					Weight:       1,
 				})
 			},

diff --git a/vms/platformvm/txs/executor/warp_verifier_test.go b/vms/platformvm/txs/executor/warp_verifier_test.go
@@ -24,7 +24,7 @@ func TestVerifyWarpMessages(t *testing.T) {
 	var (
 		subnetID     = ids.GenerateTestID()
 		chainID      = ids.GenerateTestID()
-		newValidator = func() (*bls.SecretKey, *validators.GetValidatorOutput) {
+		newValidator = func() (bls.Signer, *validators.GetValidatorOutput) {
 			sk, err := bls.NewSigner()
 			require.NoError(t, err)
 

diff --git a/vms/platformvm/warp/gwarp/signer_test.go b/vms/platformvm/warp/gwarp/signer_test.go
@@ -21,7 +21,7 @@ import (
 type testSigner struct {
 	client    *Client
 	server    warp.Signer
-	sk        *bls.SecretKey
+	sk        bls.Signer
 	networkID uint32
 	chainID   ids.ID
 }

diff --git a/vms/platformvm/warp/signature_test.go b/vms/platformvm/warp/signature_test.go
@@ -35,7 +35,7 @@ var (
 
 type testValidator struct {
 	nodeID ids.NodeID
-	sk     *bls.SecretKey
+	sk     bls.Signer
 	vdr    *Validator
 }