Remove stutter from localsigner constructor

ava-labs · Jan 28, 2025 · 62b26c5 · 62b26c5
1 parent 139f59f
commit 62b26c5
Show file tree

Hide file tree

Showing 41 changed files with 91 additions and 91 deletions.
diff --git a/config/config.go b/config/config.go
@@ -641,7 +641,7 @@ func getStakingTLSCert(v *viper.Viper) (tls.Certificate, error) {
 
 func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 	if v.GetBool(StakingEphemeralSignerEnabledKey) {
-		key, err := localsigner.NewSigner()
+		key, err := localsigner.New()
 		if err != nil {
 			return nil, fmt.Errorf("couldn't generate ephemeral signing key: %w", err)
 		}
@@ -679,7 +679,7 @@ func getStakingSigner(v *viper.Viper) (bls.Signer, error) {
 		return nil, errMissingStakingSigningKeyFile
 	}
 
-	key, err := localsigner.NewSigner()
+	key, err := localsigner.New()
 	if err != nil {
 		return nil, fmt.Errorf("couldn't generate new signing key: %w", err)
 	}

diff --git a/network/network_test.go b/network/network_test.go
@@ -175,7 +175,7 @@ func newTestNetwork(t *testing.T, count int) (*testDialer, []*testListener, []id
 		require.NoError(t, err)
 		nodeID := ids.NodeIDFromCert(cert)
 
-		blsKey, err := localsigner.NewSigner()
+		blsKey, err := localsigner.New()
 		require.NoError(t, err)
 
 		config := defaultConfig

diff --git a/network/p2p/acp118/handler_test.go b/network/p2p/acp118/handler_test.go
@@ -73,7 +73,7 @@ func TestHandler(t *testing.T) {
 			require := require.New(t)
 
 			ctx := context.Background()
-			sk, err := localsigner.NewSigner()
+			sk, err := localsigner.New()
 			require.NoError(err)
 			pk := sk.PublicKey()
 			networkID := uint32(123)

diff --git a/network/peer/ip_signer_test.go b/network/peer/ip_signer_test.go
@@ -28,7 +28,7 @@ func TestIPSigner(t *testing.T) {
 	require.NoError(err)
 
 	tlsKey := tlsCert.PrivateKey.(crypto.Signer)
-	blsKey, err := localsigner.NewSigner()
+	blsKey, err := localsigner.New()
 	require.NoError(err)
 
 	s := NewIPSigner(dynIP, tlsKey, blsKey)

diff --git a/network/peer/ip_test.go b/network/peer/ip_test.go
@@ -22,7 +22,7 @@ func TestSignedIpVerify(t *testing.T) {
 	cert1, err := staking.ParseCertificate(tlsCert1.Leaf.Raw)
 	require.NoError(t, err)
 	tlsKey1 := tlsCert1.PrivateKey.(crypto.Signer)
-	blsKey1, err := localsigner.NewSigner()
+	blsKey1, err := localsigner.New()
 	require.NoError(t, err)
 
 	tlsCert2, err := staking.NewTLSCert()

diff --git a/network/peer/peer_test.go b/network/peer/peer_test.go
@@ -111,7 +111,7 @@ func newRawTestPeer(t *testing.T, config Config) *rawTestPeer {
 		1,
 	))
 	tls := tlsCert.PrivateKey.(crypto.Signer)
-	bls, err := localsigner.NewSigner()
+	bls, err := localsigner.New()
 	require.NoError(err)
 
 	config.IPSigner = NewIPSigner(ip, tls, bls)
@@ -327,7 +327,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) {
 		1,
 	))
 
-	bogusBLSKey, err := localsigner.NewSigner()
+	bogusBLSKey, err := localsigner.New()
 	require.NoError(err)
 	require.NoError(rawPeer1.config.Validators.AddStaker(
 		constants.PrimaryNetworkID,
@@ -348,7 +348,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) {
 func TestShouldDisconnect(t *testing.T) {
 	peerID := ids.GenerateTestNodeID()
 	txID := ids.GenerateTestID()
-	blsKey, err := localsigner.NewSigner()
+	blsKey, err := localsigner.New()
 	require.NoError(t, err)
 
 	tests := []struct {

diff --git a/network/peer/test_peer.go b/network/peer/test_peer.go
@@ -101,7 +101,7 @@ func StartTestPeer(
 	}
 
 	tlsKey := tlsCert.PrivateKey.(crypto.Signer)
-	blsKey, err := localsigner.NewSigner()
+	blsKey, err := localsigner.New()
 	if err != nil {
 		return nil, err
 	}

diff --git a/network/test_network.go b/network/test_network.go
@@ -84,7 +84,7 @@ func NewTestNetworkConfig(
 		return nil, err
 	}
 
-	blsKey, err := localsigner.NewSigner()
+	blsKey, err := localsigner.New()
 	if err != nil {
 		return nil, err
 	}

diff --git a/snow/snowtest/context.go b/snow/snowtest/context.go
@@ -52,7 +52,7 @@ func ConsensusContext(ctx *snow.Context) *snow.ConsensusContext {
 func Context(tb testing.TB, chainID ids.ID) *snow.Context {
 	require := require.New(tb)
 
-	secretKey, err := localsigner.NewSigner()
+	secretKey, err := localsigner.New()
 	require.NoError(err)
 	publicKey := secretKey.PublicKey()
 

diff --git a/snow/validators/gvalidators/validator_state_test.go b/snow/validators/gvalidators/validator_state_test.go
@@ -136,15 +136,15 @@ func TestGetValidatorSet(t *testing.T) {
 	state := setupState(t, ctrl)
 
 	// Happy path
-	sk0, err := localsigner.NewSigner()
+	sk0, err := localsigner.New()
 	require.NoError(err)
 	vdr0 := &validators.GetValidatorOutput{
 		NodeID:    ids.GenerateTestNodeID(),
 		PublicKey: sk0.PublicKey(),
 		Weight:    1,
 	}
 
-	sk1, err := localsigner.NewSigner()
+	sk1, err := localsigner.New()
 	require.NoError(err)
 	vdr1 := &validators.GetValidatorOutput{
 		NodeID:    ids.GenerateTestNodeID(),
@@ -182,7 +182,7 @@ func TestGetValidatorSet(t *testing.T) {
 func TestPublicKeyDeserialize(t *testing.T) {
 	require := require.New(t)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 	pk := sk.PublicKey()
 
@@ -223,7 +223,7 @@ func setupValidatorSet(b *testing.B, size int) map[ids.NodeID]*validators.GetVal
 	b.Helper()
 
 	set := make(map[ids.NodeID]*validators.GetValidatorOutput, size)
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(b, err)
 	pk := sk.PublicKey()
 	for i := 0; i < size; i++ {

diff --git a/snow/validators/manager_test.go b/snow/validators/manager_test.go
@@ -215,7 +215,7 @@ func TestGet(t *testing.T) {
 	_, ok := m.GetValidator(subnetID, nodeID)
 	require.False(ok)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -305,7 +305,7 @@ func TestGetMap(t *testing.T) {
 	mp := m.GetMap(subnetID)
 	require.Empty(mp)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -405,7 +405,7 @@ func TestSample(t *testing.T) {
 	require.NoError(err)
 	require.Empty(sampled)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	nodeID0 := ids.GenerateTestNodeID()
@@ -465,7 +465,7 @@ func TestString(t *testing.T) {
 func TestAddCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := localsigner.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -513,7 +513,7 @@ func TestAddCallback(t *testing.T) {
 func TestAddWeightCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := localsigner.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -596,7 +596,7 @@ func TestAddWeightCallback(t *testing.T) {
 func TestRemoveWeightCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := localsigner.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (
@@ -679,7 +679,7 @@ func TestRemoveWeightCallback(t *testing.T) {
 func TestRemoveCallback(t *testing.T) {
 	require := require.New(t)
 
-	expectedSK, err := localsigner.NewSigner()
+	expectedSK, err := localsigner.New()
 	require.NoError(err)
 
 	var (

diff --git a/snow/validators/set_test.go b/snow/validators/set_test.go
@@ -166,7 +166,7 @@ func TestSetGet(t *testing.T) {
 	_, ok := s.Get(nodeID)
 	require.False(ok)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -233,7 +233,7 @@ func TestSetMap(t *testing.T) {
 	m := s.Map()
 	require.Empty(m)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	pk := sk.PublicKey()
@@ -331,7 +331,7 @@ func TestSetSample(t *testing.T) {
 	require.NoError(err)
 	require.Empty(sampled)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	nodeID0 := ids.GenerateTestNodeID()
@@ -386,7 +386,7 @@ func TestSetAddCallback(t *testing.T) {
 	require := require.New(t)
 
 	nodeID0 := ids.BuildTestNodeID([]byte{1})
-	sk0, err := localsigner.NewSigner()
+	sk0, err := localsigner.New()
 	require.NoError(err)
 	pk0 := sk0.PublicKey()
 	txID0 := ids.GenerateTestID()

diff --git a/tests/e2e/p/workflow.go b/tests/e2e/p/workflow.go
@@ -115,7 +115,7 @@ var _ = e2e.DescribePChain("[Workflow]", func() {
 		}
 
 		tc.By("issuing an AddPermissionlessValidatorTx", func() {
-			sk, err := localsigner.NewSigner()
+			sk, err := localsigner.New()
 			require.NoError(err)
 			pop := signer.NewProofOfPossession(sk)
 

diff --git a/tests/fixture/tmpnet/node.go b/tests/fixture/tmpnet/node.go
@@ -266,7 +266,7 @@ func (n *Node) EnsureBLSSigningKey() error {
 	}
 
 	// Generate a new signing key
-	newKey, err := localsigner.NewSigner()
+	newKey, err := localsigner.New()
 	if err != nil {
 		return fmt.Errorf("failed to generate staking signer key: %w", err)
 	}

diff --git a/utils/crypto/bls/signer/localsigner/bls_test.go b/utils/crypto/bls/signer/localsigner/bls_test.go
@@ -25,7 +25,7 @@ func AggregateAndVerify(publicKeys []*bls.PublicKey, signatures []*bls.Signature
 }
 
 func NewKeyPair(require *require.Assertions) (*LocalSigner, *bls.PublicKey) {
-	sk, err := NewSigner()
+	sk, err := New()
 	require.NoError(err)
 	pk := sk.PublicKey()
 	return sk, pk

diff --git a/utils/crypto/bls/signer/localsigner/localsigner.go b/utils/crypto/bls/signer/localsigner/localsigner.go
@@ -26,7 +26,7 @@ type LocalSigner struct {
 
 // NewSecretKey generates a new secret key from the local source of
 // cryptographically secure randomness.
-func NewSigner() (*LocalSigner, error) {
+func New() (*LocalSigner, error) {
 	var ikm [32]byte
 	_, err := rand.Read(ikm[:])
 	if err != nil {

diff --git a/utils/crypto/bls/signer/localsigner/serialization_test.go b/utils/crypto/bls/signer/localsigner/serialization_test.go
@@ -36,7 +36,7 @@ func TestSecretKeyBytes(t *testing.T) {
 
 	msg := utils.RandomBytes(1234)
 
-	sk, err := NewSigner()
+	sk, err := New()
 	require.NoError(err)
 	sig := sk.Sign(msg)
 	skBytes := sk.ToBytes()

diff --git a/vms/platformvm/block/builder/builder_test.go b/vms/platformvm/block/builder/builder_test.go
@@ -112,7 +112,7 @@ func TestBuildBlockShouldReward(t *testing.T) {
 		validatorEndTime      = validatorStartTime.Add(360 * 24 * time.Hour)
 	)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	rewardOwners := &secp256k1fx.OutputOwners{
@@ -320,7 +320,7 @@ func TestBuildBlockInvalidStakingDurations(t *testing.T) {
 		validatorEndTime = now.Add(env.config.MaxStakeDuration)
 	)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	rewardsOwner := &secp256k1fx.OutputOwners{
@@ -353,7 +353,7 @@ func TestBuildBlockInvalidStakingDurations(t *testing.T) {
 	// Add a validator ending past [MaxStakeDuration]
 	validator2EndTime := now.Add(env.config.MaxStakeDuration + time.Second)
 
-	sk, err = localsigner.NewSigner()
+	sk, err = localsigner.New()
 	require.NoError(err)
 
 	tx2, err := wallet.IssueAddPermissionlessValidatorTx(

diff --git a/vms/platformvm/block/executor/proposal_block_test.go b/vms/platformvm/block/executor/proposal_block_test.go
@@ -1329,7 +1329,7 @@ func TestAddValidatorProposalBlock(t *testing.T) {
 		nodeID             = ids.GenerateTestNodeID()
 	)
 
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(err)
 
 	rewardsOwner := &secp256k1fx.OutputOwners{
@@ -1414,7 +1414,7 @@ func TestAddValidatorProposalBlock(t *testing.T) {
 	validatorEndTime = validatorStartTime.Add(env.config.MinStakeDuration)
 	nodeID = ids.GenerateTestNodeID()
 
-	sk, err = localsigner.NewSigner()
+	sk, err = localsigner.New()
 	require.NoError(err)
 
 	addValidatorTx2, err := wallet.IssueAddPermissionlessValidatorTx(

diff --git a/vms/platformvm/block/executor/verifier_test.go b/vms/platformvm/block/executor/verifier_test.go
@@ -1217,7 +1217,7 @@ func TestBlockExecutionWithComplexity(t *testing.T) {
 }
 
 func TestDeactivateLowBalanceL1Validators(t *testing.T) {
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(t, err)
 
 	var (

diff --git a/vms/platformvm/network/warp_test.go b/vms/platformvm/network/warp_test.go
@@ -178,7 +178,7 @@ func TestSignatureRequestVerifySubnetToL1Conversion(t *testing.T) {
 }
 
 func TestSignatureRequestVerifyL1ValidatorRegistrationRegistered(t *testing.T) {
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(t, err)
 
 	var (
@@ -545,7 +545,7 @@ func TestSignatureRequestVerifyL1ValidatorRegistrationNotRegistered(t *testing.T
 }
 
 func TestSignatureRequestVerifyL1ValidatorWeight(t *testing.T) {
-	sk, err := localsigner.NewSigner()
+	sk, err := localsigner.New()
 	require.NoError(t, err)
 
 	const (