diff --git a/chains/manager.go b/chains/manager.go index 4c936fa3ccc9..cc680c461d21 100644 --- a/chains/manager.go +++ b/chains/manager.go @@ -490,10 +490,7 @@ func (m *manager) buildChain(chainParams ChainParameters, sb subnets.Subnet) (*c return nil, fmt.Errorf("error while creating chain's log %w", err) } - pubKey, err := m.StakingBLSKey.PublicKey() - if err != nil { - return nil, fmt.Errorf("error while getting public key: %w", err) - } + pubKey := m.StakingBLSKey.PublicKey() ctx := &snow.ConsensusContext{ Context: &snow.Context{ diff --git a/go.mod b/go.mod index f69ba3125a61..2435266e9764 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/DataDog/zstd v1.5.2 github.com/NYTimes/gziphandler v1.1.1 github.com/antithesishq/antithesis-sdk-go v0.3.8 - github.com/ava-labs/coreth v0.14.1-rc.1.0.20250203230632-591b370fc467 + github.com/ava-labs/coreth v0.14.1-rc.1.0.20250204181539-66241eebcbed github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 github.com/btcsuite/btcd/btcutil v1.1.3 github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 diff --git a/go.sum b/go.sum index ea7b5c4e42c9..ec833955f4a0 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/coreth v0.14.1-rc.1.0.20250203230632-591b370fc467 h1:jvGE3vNCpwtfNfJehX/9aevoImGBGda42cS1vU9bKQk= -github.com/ava-labs/coreth v0.14.1-rc.1.0.20250203230632-591b370fc467/go.mod h1:XEsU30KRI2qI3ghFLSrFAWHsMp9XyFa5rxpn68BJrLw= +github.com/ava-labs/coreth v0.14.1-rc.1.0.20250204181539-66241eebcbed h1:m9JXpuXXx9a/pcwHUQUJ8R1Vp3nndsJSnQxsT5brxDc= +github.com/ava-labs/coreth v0.14.1-rc.1.0.20250204181539-66241eebcbed/go.mod h1:cfL8GjzBa87pxGWIAG4iB4f6vSMyuBHtkmcUk9ms4sE= github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0= github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60/go.mod h1:/7qKobTfbzBu7eSTVaXMTr56yTYk4j2Px6/8G+idxHo= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= diff --git a/network/p2p/acp118/handler_test.go b/network/p2p/acp118/handler_test.go index 30c64ff9edac..aed5b6df78b7 100644 --- a/network/p2p/acp118/handler_test.go +++ b/network/p2p/acp118/handler_test.go @@ -75,8 +75,7 @@ func TestHandler(t *testing.T) { ctx := context.Background() sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() networkID := uint32(123) chainID := ids.GenerateTestID() signer := warp.NewSigner(sk, networkID, chainID) diff --git a/network/peer/peer_test.go b/network/peer/peer_test.go index 72a6b8d634f9..8da1d1a5e1ee 100644 --- a/network/peer/peer_test.go +++ b/network/peer/peer_test.go @@ -320,8 +320,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) { rawPeer0 := newRawTestPeer(t, sharedConfig) rawPeer1 := newRawTestPeer(t, sharedConfig) - pubKey, err := rawPeer1.config.IPSigner.blsSigner.PublicKey() - require.NoError(err) + pubKey := rawPeer1.config.IPSigner.blsSigner.PublicKey() require.NoError(rawPeer0.config.Validators.AddStaker( constants.PrimaryNetworkID, @@ -333,8 +332,7 @@ func TestInvalidBLSKeyDisconnects(t *testing.T) { bogusBLSKey, err := localsigner.New() require.NoError(err) - bogusPubkey, err := bogusBLSKey.PublicKey() - require.NoError(err) + bogusPubkey := bogusBLSKey.PublicKey() require.NoError(rawPeer1.config.Validators.AddStaker( constants.PrimaryNetworkID, @@ -357,8 +355,7 @@ func TestShouldDisconnect(t *testing.T) { txID := ids.GenerateTestID() blsKey, err := localsigner.New() require.NoError(t, err) - blsPubKey, err := blsKey.PublicKey() - require.NoError(t, err) + blsPubKey := blsKey.PublicKey() tests := []struct { name string diff --git a/node/node.go b/node/node.go index b1f0727e29c9..24b02465892b 100644 --- a/node/node.go +++ b/node/node.go @@ -575,10 +575,7 @@ func (n *Node) initNetworking(reg prometheus.Registerer) error { // we hack one together by just padding our nodeID with zeroes. dummyTxID := ids.Empty copy(dummyTxID[:], n.ID.Bytes()) - pk, err := n.Config.StakingSigningKey.PublicKey() - if err != nil { - return err - } + pk := n.Config.StakingSigningKey.PublicKey() err = n.vdrs.AddStaker( constants.PrimaryNetworkID, @@ -1493,10 +1490,7 @@ func (n *Node) initHealthAPI() error { return "validator doesn't have a BLS key", nil } - nodePK, err := n.Config.StakingSigningKey.PublicKey() - if err != nil { - return nil, fmt.Errorf("couldn't get node's BLS key: %w", err) - } + nodePK := n.Config.StakingSigningKey.PublicKey() if nodePK.Equals(vdrPK) { return "node has the correct BLS key", nil diff --git a/snow/snowtest/context.go b/snow/snowtest/context.go index 95b32609f1c2..68a04491db36 100644 --- a/snow/snowtest/context.go +++ b/snow/snowtest/context.go @@ -54,8 +54,7 @@ func Context(tb testing.TB, chainID ids.ID) *snow.Context { secretKey, err := localsigner.New() require.NoError(err) - publicKey, err := secretKey.PublicKey() - require.NoError(err) + publicKey := secretKey.PublicKey() aliaser := ids.NewAliaser() require.NoError(aliaser.Alias(constants.PlatformChainID, "P")) diff --git a/snow/validators/gvalidators/validator_state_test.go b/snow/validators/gvalidators/validator_state_test.go index 4f14dd17563a..0e81fd3e5a30 100644 --- a/snow/validators/gvalidators/validator_state_test.go +++ b/snow/validators/gvalidators/validator_state_test.go @@ -138,8 +138,7 @@ func TestGetValidatorSet(t *testing.T) { // Happy path sk0, err := localsigner.New() require.NoError(err) - pk0, err := sk0.PublicKey() - require.NoError(err) + pk0 := sk0.PublicKey() vdr0 := &validators.GetValidatorOutput{ NodeID: ids.GenerateTestNodeID(), @@ -149,9 +148,8 @@ func TestGetValidatorSet(t *testing.T) { sk1, err := localsigner.New() require.NoError(err) - pk1, err := sk1.PublicKey() + pk1 := sk1.PublicKey() - require.NoError(err) vdr1 := &validators.GetValidatorOutput{ NodeID: ids.GenerateTestNodeID(), PublicKey: pk1, @@ -190,8 +188,7 @@ func TestPublicKeyDeserialize(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) pkDe := bls.PublicKeyFromValidUncompressedBytes(pkBytes) @@ -232,8 +229,7 @@ func setupValidatorSet(b *testing.B, size int) map[ids.NodeID]*validators.GetVal set := make(map[ids.NodeID]*validators.GetValidatorOutput, size) sk, err := localsigner.New() require.NoError(b, err) - pk, err := sk.PublicKey() - require.NoError(b, err) + pk := sk.PublicKey() for i := 0; i < size; i++ { id := ids.GenerateTestNodeID() diff --git a/snow/validators/manager_test.go b/snow/validators/manager_test.go index 5ae353033b4f..7a177e97a35d 100644 --- a/snow/validators/manager_test.go +++ b/snow/validators/manager_test.go @@ -218,8 +218,7 @@ func TestGet(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() require.NoError(m.AddStaker(subnetID, nodeID, pk, ids.Empty, 1)) vdr0, ok := m.GetValidator(subnetID, nodeID) @@ -309,8 +308,7 @@ func TestGetMap(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() nodeID0 := ids.GenerateTestNodeID() require.NoError(m.AddStaker(subnetID, nodeID0, pk, ids.Empty, 2)) @@ -412,8 +410,7 @@ func TestSample(t *testing.T) { require.NoError(err) nodeID0 := ids.GenerateTestNodeID() - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() require.NoError(m.AddStaker(subnetID, nodeID0, pk, ids.Empty, 1)) sampled, err = m.Sample(subnetID, 1) @@ -471,8 +468,7 @@ func TestAddCallback(t *testing.T) { expectedSK, err := localsigner.New() require.NoError(err) - expectedPK, err := expectedSK.PublicKey() - require.NoError(err) + expectedPK := expectedSK.PublicKey() var ( expectedNodeID = ids.GenerateTestNodeID() @@ -520,8 +516,7 @@ func TestAddWeightCallback(t *testing.T) { expectedSK, err := localsigner.New() require.NoError(err) - expectedPK, err := expectedSK.PublicKey() - require.NoError(err) + expectedPK := expectedSK.PublicKey() var ( expectedNodeID = ids.GenerateTestNodeID() @@ -604,8 +599,7 @@ func TestRemoveWeightCallback(t *testing.T) { expectedSK, err := localsigner.New() require.NoError(err) - expectedPK, err := expectedSK.PublicKey() - require.NoError(err) + expectedPK := expectedSK.PublicKey() var ( expectedNodeID = ids.GenerateTestNodeID() @@ -688,8 +682,7 @@ func TestRemoveCallback(t *testing.T) { expectedSK, err := localsigner.New() require.NoError(err) - expectedPK, err := expectedSK.PublicKey() - require.NoError(err) + expectedPK := expectedSK.PublicKey() var ( expectedNodeID = ids.GenerateTestNodeID() diff --git a/snow/validators/set_test.go b/snow/validators/set_test.go index b2a5d7673de3..4ede0239dabc 100644 --- a/snow/validators/set_test.go +++ b/snow/validators/set_test.go @@ -169,8 +169,7 @@ func TestSetGet(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() require.NoError(s.Add(nodeID, pk, ids.Empty, 1)) vdr0, ok := s.Get(nodeID) @@ -237,8 +236,7 @@ func TestSetMap(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() nodeID0 := ids.GenerateTestNodeID() require.NoError(s.Add(nodeID0, pk, ids.Empty, 2)) @@ -337,8 +335,7 @@ func TestSetSample(t *testing.T) { require.NoError(err) nodeID0 := ids.GenerateTestNodeID() - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() require.NoError(s.Add(nodeID0, pk, ids.Empty, 1)) sampled, err = s.Sample(1) @@ -391,8 +388,7 @@ func TestSetAddCallback(t *testing.T) { nodeID0 := ids.BuildTestNodeID([]byte{1}) sk0, err := localsigner.New() require.NoError(err) - pk0, err := sk0.PublicKey() - require.NoError(err) + pk0 := sk0.PublicKey() txID0 := ids.GenerateTestID() weight0 := uint64(1) diff --git a/utils/crypto/bls/signer.go b/utils/crypto/bls/signer.go index 640d5ef4db8b..499b24d2cf3d 100644 --- a/utils/crypto/bls/signer.go +++ b/utils/crypto/bls/signer.go @@ -4,7 +4,7 @@ package bls type Signer interface { - PublicKey() (*PublicKey, error) + PublicKey() *PublicKey Sign(msg []byte) (*Signature, error) SignProofOfPossession(msg []byte) (*Signature, error) } diff --git a/utils/crypto/bls/signer/localsigner/bls_test.go b/utils/crypto/bls/signer/localsigner/bls_test.go index 2ccbece0e988..5cf6633c204e 100644 --- a/utils/crypto/bls/signer/localsigner/bls_test.go +++ b/utils/crypto/bls/signer/localsigner/bls_test.go @@ -32,8 +32,7 @@ type keyPair struct { func NewKeyPair(require *require.Assertions) keyPair { sk, err := New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() return keyPair{sk, pk} } diff --git a/utils/crypto/bls/signer/localsigner/localsigner.go b/utils/crypto/bls/signer/localsigner/localsigner.go index bfaba8cd95c9..e20de6c8ea78 100644 --- a/utils/crypto/bls/signer/localsigner/localsigner.go +++ b/utils/crypto/bls/signer/localsigner/localsigner.go @@ -22,6 +22,7 @@ type secretKey = blst.SecretKey type LocalSigner struct { sk *secretKey + pk *bls.PublicKey } // NewSecretKey generates a new secret key from the local source of @@ -34,8 +35,9 @@ func New() (*LocalSigner, error) { } sk := blst.KeyGen(ikm[:]) ikm = [32]byte{} // zero out the ikm + pk := new(bls.PublicKey).From(sk) - return &LocalSigner{sk: sk}, nil + return &LocalSigner{sk: sk, pk: pk}, nil } // ToBytes returns the big-endian format of the secret key. @@ -58,8 +60,8 @@ func FromBytes(skBytes []byte) (*LocalSigner, error) { // PublicKey returns the public key that corresponds to this secret // key. -func (s *LocalSigner) PublicKey() (*bls.PublicKey, error) { - return new(bls.PublicKey).From(s.sk), nil +func (s *LocalSigner) PublicKey() *bls.PublicKey { + return s.pk } // Sign [msg] to authorize this message diff --git a/vms/platformvm/block/executor/verifier_test.go b/vms/platformvm/block/executor/verifier_test.go index 026713ff35e4..2a6c324e98f6 100644 --- a/vms/platformvm/block/executor/verifier_test.go +++ b/vms/platformvm/block/executor/verifier_test.go @@ -1219,8 +1219,7 @@ func TestBlockExecutionWithComplexity(t *testing.T) { func TestDeactivateLowBalanceL1Validators(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() var ( pkBytes = bls.PublicKeyToUncompressedBytes(pk) diff --git a/vms/platformvm/network/warp_test.go b/vms/platformvm/network/warp_test.go index 446f1d60dc40..9a1905f53481 100644 --- a/vms/platformvm/network/warp_test.go +++ b/vms/platformvm/network/warp_test.go @@ -180,8 +180,7 @@ func TestSignatureRequestVerifySubnetToL1Conversion(t *testing.T) { func TestSignatureRequestVerifyL1ValidatorRegistrationRegistered(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() var ( l1Validator = state.L1Validator{ @@ -245,8 +244,7 @@ func TestSignatureRequestVerifyL1ValidatorRegistrationNotRegistered(t *testing.T sk, err := localsigner.FromBytes(skBytes) require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() var ( convertedSubnetID = ids.ID{3} @@ -550,8 +548,7 @@ func TestSignatureRequestVerifyL1ValidatorRegistrationNotRegistered(t *testing.T func TestSignatureRequestVerifyL1ValidatorWeight(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() const ( weight = 100 diff --git a/vms/platformvm/service_test.go b/vms/platformvm/service_test.go index 886cca2cf247..a2d0b42a835a 100644 --- a/vms/platformvm/service_test.go +++ b/vms/platformvm/service_test.go @@ -1029,8 +1029,7 @@ func TestGetValidatorsAtReplyMarshalling(t *testing.T) { nodeID := ids.GenerateTestNodeID() sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() reply.Validators[nodeID] = &validators.GetValidatorOutput{ NodeID: nodeID, @@ -1340,14 +1339,12 @@ func TestGetCurrentValidatorsForL1(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) otherSK, err := localsigner.New() require.NoError(t, err) - otherPK, err := otherSK.PublicKey() - require.NoError(t, err) + otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) tests := []struct { diff --git a/vms/platformvm/signer/proof_of_possession.go b/vms/platformvm/signer/proof_of_possession.go index 416df20301e8..2f30a43f1fc0 100644 --- a/vms/platformvm/signer/proof_of_possession.go +++ b/vms/platformvm/signer/proof_of_possession.go @@ -29,10 +29,7 @@ type ProofOfPossession struct { } func NewProofOfPossession(sk bls.Signer) (*ProofOfPossession, error) { - pk, err := sk.PublicKey() - if err != nil { - return nil, err - } + pk := sk.PublicKey() pkBytes := bls.PublicKeyToCompressedBytes(pk) sig, err := sk.SignProofOfPossession(pkBytes) diff --git a/vms/platformvm/state/state_test.go b/vms/platformvm/state/state_test.go index a8fc9c27eb55..3d190c2ab23c 100644 --- a/vms/platformvm/state/state_test.go +++ b/vms/platformvm/state/state_test.go @@ -789,8 +789,7 @@ func TestState_ApplyValidatorDiffs(t *testing.T) { for i := range primaryStakers { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() timeOffset := time.Duration(i) * time.Second primaryStakers[i] = Staker{ @@ -1520,14 +1519,12 @@ func TestL1Validators(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) otherSK, err := localsigner.New() require.NoError(t, err) - otherPK, err := otherSK.PublicKey() - require.NoError(t, err) + otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) tests := []struct { @@ -2024,8 +2021,7 @@ func TestLoadL1ValidatorAndLegacy(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) l1Validator := L1Validator{ @@ -2103,14 +2099,12 @@ func TestGetCurrentValidators(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) otherSK, err := localsigner.New() require.NoError(t, err) - otherPK, err := otherSK.PublicKey() - require.NoError(t, err) + otherPK := otherSK.PublicKey() otherPKBytes := bls.PublicKeyToUncompressedBytes(otherPK) now := time.Now() diff --git a/vms/platformvm/txs/executor/standard_tx_executor_test.go b/vms/platformvm/txs/executor/standard_tx_executor_test.go index df833a75a3e3..8746b232c5b7 100644 --- a/vms/platformvm/txs/executor/standard_tx_executor_test.go +++ b/vms/platformvm/txs/executor/standard_tx_executor_test.go @@ -2544,8 +2544,7 @@ func TestStandardExecutorConvertSubnetToL1Tx(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() pop, err := signer.NewProofOfPossession(sk) require.NoError(err) @@ -2748,8 +2747,7 @@ func TestStandardExecutorRegisterL1ValidatorTx(t *testing.T) { // Create the subnet conversion initialSK, err := localsigner.New() require.NoError(t, err) - initialPK, err := initialSK.PublicKey() - require.NoError(t, err) + initialPK := initialSK.PublicKey() initialPoP, err := signer.NewProofOfPossession(initialSK) require.NoError(t, err) @@ -2806,8 +2804,7 @@ func TestStandardExecutorRegisterL1ValidatorTx(t *testing.T) { require.NoError(t, err) pop, err := signer.NewProofOfPossession(sk) require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToUncompressedBytes(pk) diff --git a/vms/platformvm/txs/executor/state_changes_test.go b/vms/platformvm/txs/executor/state_changes_test.go index 9b2d461e4d67..ef286539a6b6 100644 --- a/vms/platformvm/txs/executor/state_changes_test.go +++ b/vms/platformvm/txs/executor/state_changes_test.go @@ -231,8 +231,7 @@ func TestAdvanceTimeTo_RemovesStaleExpiries(t *testing.T) { func TestAdvanceTimeTo_UpdateL1Validators(t *testing.T) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() const ( secondsToAdvance = 3 diff --git a/vms/platformvm/txs/executor/warp_verifier_test.go b/vms/platformvm/txs/executor/warp_verifier_test.go index 4e9e0782d6be..4959e11bf44f 100644 --- a/vms/platformvm/txs/executor/warp_verifier_test.go +++ b/vms/platformvm/txs/executor/warp_verifier_test.go @@ -28,8 +28,7 @@ func TestVerifyWarpMessages(t *testing.T) { newValidator = func() (bls.Signer, *validators.GetValidatorOutput) { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() return sk, &validators.GetValidatorOutput{ NodeID: ids.GenerateTestNodeID(), diff --git a/vms/platformvm/validator_set_property_test.go b/vms/platformvm/validator_set_property_test.go index 84e9ae0bf7f0..c7c3994a547a 100644 --- a/vms/platformvm/validator_set_property_test.go +++ b/vms/platformvm/validator_set_property_test.go @@ -420,10 +420,7 @@ func buildTimestampsList(events []uint8, currentTime time.Time, nodeID ids.NodeI if err != nil { return nil, fmt.Errorf("could not make private key: %w", err) } - pk, err := sk.PublicKey() - if err != nil { - return nil, fmt.Errorf("could not get public key: %w", err) - } + pk := sk.PublicKey() res = append(res, &validatorInputData{ eventType: startPrimaryWithBLS, @@ -462,10 +459,7 @@ func buildTimestampsList(events []uint8, currentTime time.Time, nodeID ids.NodeI if err != nil { return nil, fmt.Errorf("could not make private key: %w", err) } - pk, err := sk.PublicKey() - if err != nil { - return nil, fmt.Errorf("could not get public key: %w", err) - } + pk := sk.PublicKey() endTime := currentTime.Add(defaultMinStakingDuration) val := &validatorInputData{ diff --git a/vms/platformvm/validators/manager_benchmark_test.go b/vms/platformvm/validators/manager_benchmark_test.go index 9c637260beed..a46f9c41bb4d 100644 --- a/vms/platformvm/validators/manager_benchmark_test.go +++ b/vms/platformvm/validators/manager_benchmark_test.go @@ -113,10 +113,7 @@ func addPrimaryValidator( if err != nil { return ids.EmptyNodeID, err } - pk, err := sk.PublicKey() - if err != nil { - return ids.EmptyNodeID, err - } + pk := sk.PublicKey() nodeID := ids.GenerateTestNodeID() if err := s.PutCurrentValidator(&state.Staker{ diff --git a/vms/platformvm/validators/manager_test.go b/vms/platformvm/validators/manager_test.go index eb6a97b9ca48..17786a12c491 100644 --- a/vms/platformvm/validators/manager_test.go +++ b/vms/platformvm/validators/manager_test.go @@ -41,8 +41,7 @@ func TestGetValidatorSet_AfterEtna(t *testing.T) { sk, err := localsigner.New() require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() var ( subnetID = ids.GenerateTestID() diff --git a/vms/platformvm/vm_regression_test.go b/vms/platformvm/vm_regression_test.go index 0c7599f8f689..54037697fde6 100644 --- a/vms/platformvm/vm_regression_test.go +++ b/vms/platformvm/vm_regression_test.go @@ -1480,8 +1480,7 @@ func TestSubnetValidatorBLSKeyDiffAfterExpiry(t *testing.T) { ) sk1, err := localsigner.New() require.NoError(t, err) - pk1, err := sk1.PublicKey() - require.NoError(t, err) + pk1 := sk1.PublicKey() pop1, err := signer.NewProofOfPossession(sk1) require.NoError(t, err) @@ -1589,8 +1588,7 @@ func TestSubnetValidatorBLSKeyDiffAfterExpiry(t *testing.T) { // reinsert primary validator with a different BLS key sk2, err := localsigner.New() require.NoError(t, err) - pk2, err := sk2.PublicKey() - require.NoError(t, err) + pk2 := sk2.PublicKey() pop2, err := signer.NewProofOfPossession(sk2) require.NoError(t, err) diff --git a/vms/platformvm/warp/message/register_l1_validator_test.go b/vms/platformvm/warp/message/register_l1_validator_test.go index befc84035cbe..970bd8dfaabf 100644 --- a/vms/platformvm/warp/message/register_l1_validator_test.go +++ b/vms/platformvm/warp/message/register_l1_validator_test.go @@ -20,8 +20,7 @@ func newBLSPublicKey(t *testing.T) [bls.PublicKeyLen]byte { sk, err := localsigner.New() require.NoError(t, err) - pk, err := sk.PublicKey() - require.NoError(t, err) + pk := sk.PublicKey() pkBytes := bls.PublicKeyToCompressedBytes(pk) return [bls.PublicKeyLen]byte(pkBytes) } diff --git a/vms/platformvm/warp/signature_test.go b/vms/platformvm/warp/signature_test.go index 31874fc93f82..d2cd10beea39 100644 --- a/vms/platformvm/warp/signature_test.go +++ b/vms/platformvm/warp/signature_test.go @@ -51,7 +51,7 @@ func newTestValidator() *testValidator { } nodeID := ids.GenerateTestNodeID() - pk, _ := sk.PublicKey() // local signer always returns a public key + pk := sk.PublicKey() return &testValidator{ nodeID: nodeID, sk: sk, diff --git a/vms/platformvm/warp/signertest/signertest.go b/vms/platformvm/warp/signertest/signertest.go index 4dec2ef84403..698fe39fe097 100644 --- a/vms/platformvm/warp/signertest/signertest.go +++ b/vms/platformvm/warp/signertest/signertest.go @@ -70,8 +70,7 @@ func TestVerifies(t *testing.T, s warp.Signer, sk bls.Signer, networkID uint32, sig, err := bls.SignatureFromBytes(sigBytes) require.NoError(err) - pk, err := sk.PublicKey() - require.NoError(err) + pk := sk.PublicKey() msgBytes := msg.Bytes() require.True(bls.Verify(pk, sig, msgBytes)) } diff --git a/vms/platformvm/warp/validator_test.go b/vms/platformvm/warp/validator_test.go index bed6e824f356..15048f5ce29d 100644 --- a/vms/platformvm/warp/validator_test.go +++ b/vms/platformvm/warp/validator_test.go @@ -165,8 +165,7 @@ func TestGetCanonicalValidatorSet(t *testing.T) { func TestFilterValidators(t *testing.T) { sk0, err := localsigner.New() require.NoError(t, err) - pk0, err := sk0.PublicKey() - require.NoError(t, err) + pk0 := sk0.PublicKey() vdr0 := &Validator{ PublicKey: pk0, PublicKeyBytes: bls.PublicKeyToUncompressedBytes(pk0), @@ -175,8 +174,7 @@ func TestFilterValidators(t *testing.T) { sk1, err := localsigner.New() require.NoError(t, err) - pk1, err := sk1.PublicKey() - require.NoError(t, err) + pk1 := sk1.PublicKey() vdr1 := &Validator{ PublicKey: pk1, PublicKeyBytes: bls.PublicKeyToUncompressedBytes(pk1), @@ -320,8 +318,7 @@ func BenchmarkGetCanonicalValidatorSet(b *testing.B) { nodeID := ids.GenerateTestNodeID() blsPrivateKey, err := localsigner.New() require.NoError(b, err) - blsPublicKey, err := blsPrivateKey.PublicKey() - require.NoError(b, err) + blsPublicKey := blsPrivateKey.PublicKey() getValidatorOutputs = append(getValidatorOutputs, &validators.GetValidatorOutput{ NodeID: nodeID, PublicKey: blsPublicKey,