diff --git a/config/config.go b/config/config.go index 91dfc4b608b3..be15e8a6f8fd 100644 --- 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 index 0fb495369e27..771b351270b6 100644 --- 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 index 3065490d589e..aed5b6df78b7 100644 --- 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 index b45ae5f10404..5d0a3b172022 100644 --- 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 index 3711afa0d832..ccaa2804d67c 100644 --- 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 index b5f02c1fe1ca..b039b870f35f 100644 --- 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 index ce775a452e92..20396ad942aa 100644 --- 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 index 4fd3ae712fcf..e8ae032cd5a9 100644 --- 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 index 8ec187e75126..68a04491db36 100644 --- 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 index 5fc1384d0163..ee55ef8568e0 100644 --- a/snow/validators/gvalidators/validator_state_test.go +++ b/snow/validators/gvalidators/validator_state_test.go @@ -136,7 +136,7 @@ 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(), @@ -144,7 +144,7 @@ func TestGetValidatorSet(t *testing.T) { 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 index 4208dc9bbc45..36ef4b4fff16 100644 --- 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 index dc2efcde720f..4ede0239dabc 100644 --- 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 index 0ca615ea9fb1..d6f01e6ddda2 100644 --- 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 index 93e7826c50ba..bfc6acad7610 100644 --- 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 index 978fea332a51..3969529dde38 100644 --- 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 index ac6ac987a897..5959e1b7d097 100644 --- 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 index e0636272dff1..eb9ca0ad6a9c 100644 --- 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 index 9c2156faee0f..d61de89dcece 100644 --- 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 index 38045e79fd17..17720c4511a7 100644 --- 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 index 37c5c48376d4..b278a5845a49 100644 --- 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 index d8b20925f26c..8e3413f1d6c8 100644 --- 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 ( diff --git a/vms/platformvm/service_test.go b/vms/platformvm/service_test.go index 1d7c584403af..51b6efcdb907 100644 --- a/vms/platformvm/service_test.go +++ b/vms/platformvm/service_test.go @@ -264,7 +264,7 @@ func TestGetTx(t *testing.T) { func(t testing.TB, s *Service) *txs.Tx { wallet := newWallet(t, s.vm, walletConfig{}) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) rewardsOwner := &secp256k1fx.OutputOwners{ @@ -800,7 +800,7 @@ func TestGetValidatorsAt(t *testing.T) { Addrs: []ids.ShortID{ids.GenerateTestShortID()}, } - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) tx, err := wallet.IssueAddPermissionlessValidatorTx( @@ -1023,7 +1023,7 @@ func TestGetValidatorsAtReplyMarshalling(t *testing.T) { } { nodeID := ids.GenerateTestNodeID() - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) reply.Validators[nodeID] = &validators.GetValidatorOutput{ NodeID: nodeID, @@ -1331,12 +1331,12 @@ func FuzzGetFeeState(f *testing.F) { func TestGetCurrentValidatorsForL1(t *testing.T) { subnetID := ids.GenerateTestID() - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) - otherSK, err := localsigner.NewSigner() + otherSK, err := localsigner.New() require.NoError(t, err) otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) diff --git a/vms/platformvm/signer/proof_of_possession_test.go b/vms/platformvm/signer/proof_of_possession_test.go index 0b567d5f4378..a30d5dac093a 100644 --- a/vms/platformvm/signer/proof_of_possession_test.go +++ b/vms/platformvm/signer/proof_of_possession_test.go @@ -42,7 +42,7 @@ func TestProofOfPossession(t *testing.T) { func TestNewProofOfPossessionDeterministic(t *testing.T) { require := require.New(t) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) blsPOP0 := NewProofOfPossession(sk) @@ -61,7 +61,7 @@ func BenchmarkProofOfPossessionVerify(b *testing.B) { } func newProofOfPossession() (*ProofOfPossession, error) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() if err != nil { return nil, err } diff --git a/vms/platformvm/state/staker_test.go b/vms/platformvm/state/staker_test.go index 23846fc1a13e..5495868e6f15 100644 --- a/vms/platformvm/state/staker_test.go +++ b/vms/platformvm/state/staker_test.go @@ -202,7 +202,7 @@ func TestNewPendingStaker(t *testing.T) { func generateStakerTx(require *require.Assertions) *txs.AddPermissionlessValidatorTx { nodeID := ids.GenerateTestNodeID() - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) pop := signer.NewProofOfPossession(sk) subnetID := ids.GenerateTestID() diff --git a/vms/platformvm/state/state_test.go b/vms/platformvm/state/state_test.go index fa2e3d49770d..46c5939f7afa 100644 --- a/vms/platformvm/state/state_test.go +++ b/vms/platformvm/state/state_test.go @@ -546,7 +546,7 @@ func TestState_writeStakers(t *testing.T) { func createPermissionlessValidatorTx(t testing.TB, subnetID ids.ID, validatorsData txs.Validator) *txs.AddPermissionlessValidatorTx { var sig signer.Signer = &signer.Empty{} if subnetID == constants.PrimaryNetworkID { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) sig = signer.NewProofOfPossession(sk) } @@ -786,7 +786,7 @@ func TestState_ApplyValidatorDiffs(t *testing.T) { subnetStakers = make([]Staker, numNodes) ) for i := range primaryStakers { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) timeOffset := time.Duration(i) * time.Second @@ -1515,12 +1515,12 @@ func TestL1Validators(t *testing.T) { NodeID: ids.GenerateTestNodeID(), } - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) - otherSK, err := localsigner.NewSigner() + otherSK, err := localsigner.New() require.NoError(t, err) otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) @@ -2017,7 +2017,7 @@ func TestLoadL1ValidatorAndLegacy(t *testing.T) { } require.NoError(state.PutCurrentValidator(legacyStaker)) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) @@ -2095,12 +2095,12 @@ func TestGetCurrentValidators(t *testing.T) { subnetID2 := ids.GenerateTestID() subnetIDs := []ids.ID{subnetID1, subnetID2} - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) - otherSK, err := localsigner.NewSigner() + otherSK, err := localsigner.New() require.NoError(t, err) otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) diff --git a/vms/platformvm/txs/add_permissionless_validator_tx_test.go b/vms/platformvm/txs/add_permissionless_validator_tx_test.go index cdcb518491a7..73c6b9c0c505 100644 --- a/vms/platformvm/txs/add_permissionless_validator_tx_test.go +++ b/vms/platformvm/txs/add_permissionless_validator_tx_test.go @@ -1397,7 +1397,7 @@ func TestAddPermissionlessValidatorTxSyntacticVerify(t *testing.T) { }, } - blsSK, err := localsigner.NewSigner() + blsSK, err := localsigner.New() require.NoError(t, err) blsPOP := signer.NewProofOfPossession(blsSK) diff --git a/vms/platformvm/txs/convert_subnet_to_l1_tx_test.go b/vms/platformvm/txs/convert_subnet_to_l1_tx_test.go index 81d231bf721f..deef28852d10 100644 --- a/vms/platformvm/txs/convert_subnet_to_l1_tx_test.go +++ b/vms/platformvm/txs/convert_subnet_to_l1_tx_test.go @@ -546,7 +546,7 @@ func TestConvertSubnetToL1TxSerialization(t *testing.T) { } func TestConvertSubnetToL1TxSyntacticVerify(t *testing.T) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) var ( diff --git a/vms/platformvm/txs/executor/standard_tx_executor_test.go b/vms/platformvm/txs/executor/standard_tx_executor_test.go index a789888ea206..0c5f90c9bc46 100644 --- a/vms/platformvm/txs/executor/standard_tx_executor_test.go +++ b/vms/platformvm/txs/executor/standard_tx_executor_test.go @@ -1451,7 +1451,7 @@ func TestDurangoMemoField(t *testing.T) { chainTime = env.state.GetTimestamp() endTime = chainTime.Add(defaultMaxStakingDuration) ) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) wallet := newWallet(t, env, walletConfig{}) @@ -2540,7 +2540,7 @@ func TestStandardExecutorConvertSubnetToL1Tx(t *testing.T) { t.Run(test.name, func(t *testing.T) { require := require.New(t) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) // Create the ConvertSubnetToL1Tx @@ -2741,7 +2741,7 @@ func TestStandardExecutorRegisterL1ValidatorTx(t *testing.T) { require.NoError(t, err) // Create the subnet conversion - initialSK, err := localsigner.NewSigner() + initialSK, err := localsigner.New() require.NoError(t, err) const ( @@ -2794,7 +2794,7 @@ func TestStandardExecutorRegisterL1ValidatorTx(t *testing.T) { const weight = 1 // Create the Warp message - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pop := signer.NewProofOfPossession(sk) pk := sk.PublicKey() @@ -3263,7 +3263,7 @@ func TestStandardExecutorSetL1ValidatorWeightTx(t *testing.T) { require.NoError(t, err) // Create the subnet conversion - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) const ( @@ -3758,7 +3758,7 @@ func TestStandardExecutorIncreaseL1ValidatorBalanceTx(t *testing.T) { require.NoError(t, err) // Create the subnet conversion - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) const ( @@ -4046,7 +4046,7 @@ func TestStandardExecutorDisableL1ValidatorTx(t *testing.T) { require.NoError(t, err) // Create the subnet conversion - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) const ( diff --git a/vms/platformvm/txs/executor/state_changes_test.go b/vms/platformvm/txs/executor/state_changes_test.go index 04831b452b3b..b85043ca0099 100644 --- a/vms/platformvm/txs/executor/state_changes_test.go +++ b/vms/platformvm/txs/executor/state_changes_test.go @@ -229,7 +229,7 @@ func TestAdvanceTimeTo_RemovesStaleExpiries(t *testing.T) { } func TestAdvanceTimeTo_UpdateL1Validators(t *testing.T) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) const ( diff --git a/vms/platformvm/txs/executor/warp_verifier_test.go b/vms/platformvm/txs/executor/warp_verifier_test.go index fe7f898caac6..cca492344911 100644 --- a/vms/platformvm/txs/executor/warp_verifier_test.go +++ b/vms/platformvm/txs/executor/warp_verifier_test.go @@ -26,7 +26,7 @@ func TestVerifyWarpMessages(t *testing.T) { subnetID = ids.GenerateTestID() chainID = ids.GenerateTestID() newValidator = func() (bls.Signer, *validators.GetValidatorOutput) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) return sk, &validators.GetValidatorOutput{ diff --git a/vms/platformvm/validator_set_property_test.go b/vms/platformvm/validator_set_property_test.go index dd3c310c254d..8a1333353b2e 100644 --- a/vms/platformvm/validator_set_property_test.go +++ b/vms/platformvm/validator_set_property_test.go @@ -276,7 +276,7 @@ func addPrimaryValidatorWithBLSKey(t testing.TB, vm *VM, data *validatorInputDat wallet := newWallet(t, vm, walletConfig{}) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) rewardsOwner := &secp256k1fx.OutputOwners{ @@ -414,7 +414,7 @@ func buildTimestampsList(events []uint8, currentTime time.Time, nodeID ids.NodeI currentTime = currentTime.Add(txexecutor.SyncBound) switch endTime := currentTime.Add(defaultMinStakingDuration); events[0] { case startPrimaryWithBLS: - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() if err != nil { return nil, fmt.Errorf("could not make private key: %w", err) } @@ -452,7 +452,7 @@ func buildTimestampsList(events []uint8, currentTime time.Time, nodeID ids.NodeI case startPrimaryWithBLS: currentTime = currentPrimaryVal.endTime.Add(txexecutor.SyncBound) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() if err != nil { return nil, fmt.Errorf("could not make private key: %w", err) } diff --git a/vms/platformvm/validators/manager_benchmark_test.go b/vms/platformvm/validators/manager_benchmark_test.go index 27dc488b7dbf..a58074ec43d1 100644 --- a/vms/platformvm/validators/manager_benchmark_test.go +++ b/vms/platformvm/validators/manager_benchmark_test.go @@ -109,7 +109,7 @@ func addPrimaryValidator( endTime time.Time, height uint64, ) (ids.NodeID, error) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() if err != nil { return ids.EmptyNodeID, err } diff --git a/vms/platformvm/validators/manager_test.go b/vms/platformvm/validators/manager_test.go index 981aa1451e15..677daa5af952 100644 --- a/vms/platformvm/validators/manager_test.go +++ b/vms/platformvm/validators/manager_test.go @@ -39,7 +39,7 @@ func TestGetValidatorSet_AfterEtna(t *testing.T) { Upgrades: upgrades, }) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) var ( subnetID = ids.GenerateTestID() diff --git a/vms/platformvm/vm_regression_test.go b/vms/platformvm/vm_regression_test.go index 89a56147d495..d63ab5f712ac 100644 --- a/vms/platformvm/vm_regression_test.go +++ b/vms/platformvm/vm_regression_test.go @@ -1478,7 +1478,7 @@ func TestSubnetValidatorBLSKeyDiffAfterExpiry(t *testing.T) { Addrs: []ids.ShortID{ids.GenerateTestShortID()}, } ) - sk1, err := localsigner.NewSigner() + sk1, err := localsigner.New() require.NoError(t, err) pk1 := sk1.PublicKey() @@ -1584,7 +1584,7 @@ func TestSubnetValidatorBLSKeyDiffAfterExpiry(t *testing.T) { t.Logf("primaryEndHeight: %d", primaryEndHeight) // reinsert primary validator with a different BLS key - sk2, err := localsigner.NewSigner() + sk2, err := localsigner.New() require.NoError(t, err) pk2 := sk2.PublicKey() @@ -1750,7 +1750,7 @@ func TestPrimaryNetworkValidatorPopulatedToEmptyBLSKeyDiff(t *testing.T) { require.NoError(err) // reinsert primary validator with a different BLS key - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) primaryRestartTx, err := wallet.IssueAddPermissionlessValidatorTx( @@ -1919,7 +1919,7 @@ func TestSubnetValidatorPopulatedToEmptyBLSKeyDiff(t *testing.T) { require.NoError(err) // reinsert primary validator with a different BLS key - sk2, err := localsigner.NewSigner() + sk2, err := localsigner.New() require.NoError(err) primaryRestartTx, err := wallet.IssueAddPermissionlessValidatorTx( diff --git a/vms/platformvm/vm_test.go b/vms/platformvm/vm_test.go index 62bab34ba315..3e0f69ee8e90 100644 --- a/vms/platformvm/vm_test.go +++ b/vms/platformvm/vm_test.go @@ -317,7 +317,7 @@ func TestAddValidatorCommit(t *testing.T) { } ) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) // create valid tx @@ -473,7 +473,7 @@ func TestAddValidatorInvalidNotReissued(t *testing.T) { startTime := latestForkTime.Add(txexecutor.SyncBound).Add(1 * time.Second) endTime := startTime.Add(defaultMinStakingDuration) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) rewardsOwner := &secp256k1fx.OutputOwners{ @@ -1908,7 +1908,7 @@ func TestRemovePermissionedValidatorDuringAddPending(t *testing.T) { wallet := newWallet(t, vm, walletConfig{}) nodeID := ids.GenerateTestNodeID() - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) rewardsOwner := &secp256k1fx.OutputOwners{ Threshold: 1, @@ -2124,7 +2124,7 @@ func TestPruneMempool(t *testing.T) { endTime = startTime.Add(vm.MinStakeDuration) ) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) rewardsOwner := &secp256k1fx.OutputOwners{ diff --git a/vms/platformvm/warp/gwarp/signer_test.go b/vms/platformvm/warp/gwarp/signer_test.go index 47d4ed79c308..46f88ce5537b 100644 --- a/vms/platformvm/warp/gwarp/signer_test.go +++ b/vms/platformvm/warp/gwarp/signer_test.go @@ -30,7 +30,7 @@ type testSigner struct { func setupSigner(t testing.TB) *testSigner { require := require.New(t) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(err) chainID := ids.GenerateTestID() diff --git a/vms/platformvm/warp/message/register_l1_validator_test.go b/vms/platformvm/warp/message/register_l1_validator_test.go index 22cec55ebe1f..970bd8dfaabf 100644 --- a/vms/platformvm/warp/message/register_l1_validator_test.go +++ b/vms/platformvm/warp/message/register_l1_validator_test.go @@ -17,7 +17,7 @@ import ( ) func newBLSPublicKey(t *testing.T) [bls.PublicKeyLen]byte { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pk := sk.PublicKey() diff --git a/vms/platformvm/warp/signature_test.go b/vms/platformvm/warp/signature_test.go index 9e31f1efaae8..5149d701bb6f 100644 --- a/vms/platformvm/warp/signature_test.go +++ b/vms/platformvm/warp/signature_test.go @@ -45,7 +45,7 @@ func (v *testValidator) Compare(o *testValidator) int { } func newTestValidator() *testValidator { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() if err != nil { panic(err) } diff --git a/vms/platformvm/warp/signer_test.go b/vms/platformvm/warp/signer_test.go index d1daca487d72..b6ee92f62075 100644 --- a/vms/platformvm/warp/signer_test.go +++ b/vms/platformvm/warp/signer_test.go @@ -18,7 +18,7 @@ import ( func TestSigner(t *testing.T) { for name, test := range signertest.SignerTests { t.Run(name, func(t *testing.T) { - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) chainID := ids.GenerateTestID() diff --git a/vms/platformvm/warp/validator_test.go b/vms/platformvm/warp/validator_test.go index 8cd5f7f57769..ffded4cf2a9a 100644 --- a/vms/platformvm/warp/validator_test.go +++ b/vms/platformvm/warp/validator_test.go @@ -163,7 +163,7 @@ func TestGetCanonicalValidatorSet(t *testing.T) { } func TestFilterValidators(t *testing.T) { - sk0, err := localsigner.NewSigner() + sk0, err := localsigner.New() require.NoError(t, err) pk0 := sk0.PublicKey() vdr0 := &Validator{ @@ -172,7 +172,7 @@ func TestFilterValidators(t *testing.T) { Weight: 1, } - sk1, err := localsigner.NewSigner() + sk1, err := localsigner.New() require.NoError(t, err) pk1 := sk1.PublicKey() vdr1 := &Validator{ @@ -316,7 +316,7 @@ func BenchmarkGetCanonicalValidatorSet(b *testing.B) { getValidatorOutputs := make([]*validators.GetValidatorOutput, 0, numNodes) for i := 0; i < numNodes; i++ { nodeID := ids.GenerateTestNodeID() - blsPrivateKey, err := localsigner.NewSigner() + blsPrivateKey, err := localsigner.New() require.NoError(b, err) blsPublicKey := blsPrivateKey.PublicKey() getValidatorOutputs = append(getValidatorOutputs, &validators.GetValidatorOutput{ diff --git a/wallet/chain/p/builder_test.go b/wallet/chain/p/builder_test.go index aa27b99e3594..3880fe14b9b4 100644 --- a/wallet/chain/p/builder_test.go +++ b/wallet/chain/p/builder_test.go @@ -470,7 +470,7 @@ func TestAddPermissionlessValidatorTx(t *testing.T) { delegationShares uint32 = reward.PercentDenominator ) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pop := signer.NewProofOfPossession(sk) @@ -571,9 +571,9 @@ func TestAddPermissionlessDelegatorTx(t *testing.T) { } func TestConvertSubnetToL1Tx(t *testing.T) { - sk0, err := localsigner.NewSigner() + sk0, err := localsigner.New() require.NoError(t, err) - sk1, err := localsigner.NewSigner() + sk1, err := localsigner.New() require.NoError(t, err) var ( @@ -656,7 +656,7 @@ func TestRegisterL1ValidatorTx(t *testing.T) { balance = units.Avax ) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) pop := signer.NewProofOfPossession(sk) @@ -779,7 +779,7 @@ func TestSetL1ValidatorWeightTx(t *testing.T) { ) require.NoError(t, err) - sk, err := localsigner.NewSigner() + sk, err := localsigner.New() require.NoError(t, err) warp, err := warp.NewMessage(