Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crypto/simulation: drop dead code and dependency #141

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.22

require (
github.com/stretchr/testify v1.9.0
github.com/twmb/murmur3 v1.1.8
go.uber.org/zap v1.27.0
)

Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg=
github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
Expand Down
18 changes: 3 additions & 15 deletions internal/crypto/ecdsa.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,9 @@
return e.Equal(other.(*ECDSAPub).PublicKey)
}

// MarshalBinary implements encoding.BinaryMarshaler interface.
func (e ECDSAPub) MarshalBinary() ([]byte, error) {
return elliptic.MarshalCompressed(e.PublicKey.Curve, e.PublicKey.X, e.PublicKey.Y), nil
}

// UnmarshalBinary implements encoding.BinaryUnmarshaler interface.
func (e *ECDSAPub) UnmarshalBinary(data []byte) error {
e.PublicKey = new(ecdsa.PublicKey)
e.PublicKey.Curve = elliptic.P256()
e.PublicKey.X, e.PublicKey.Y = elliptic.UnmarshalCompressed(e.PublicKey.Curve, data)
if e.PublicKey.X == nil {
return errors.New("can't unmarshal ECDSA public key")
}

return nil
// Compare does three-way comparison of ECDSAPub.
func (e *ECDSAPub) Compare(p *ECDSAPub) int {
return e.X.Cmp(p.X)

Check warning on line 72 in internal/crypto/ecdsa.go

View check run for this annotation

Codecov / codecov/patch

internal/crypto/ecdsa.go#L71-L72

Added lines #L71 - L72 were not covered by tests
}

// Verify verifies signature using P-256 curve.
Expand Down
16 changes: 0 additions & 16 deletions internal/crypto/ecdsa_test.go
Original file line number Diff line number Diff line change
@@ -1,28 +1,12 @@
package crypto

import (
"crypto/rand"
"errors"
"testing"

"github.com/stretchr/testify/require"
)

func TestECDSA_MarshalUnmarshal(t *testing.T) {
priv, pub := generateECDSA(rand.Reader)
require.NotNil(t, priv)
require.NotNil(t, pub)

data, err := pub.(*ECDSAPub).MarshalBinary()
require.NoError(t, err)

pub1 := new(ECDSAPub)
require.NoError(t, pub1.UnmarshalBinary(data))
require.Equal(t, pub, pub1)

require.Error(t, pub1.UnmarshalBinary([]byte{0, 1, 2, 3}))
}

// Do not generate keys with not enough entropy.
func TestECDSA_Generate(t *testing.T) {
rd := &errorReader{}
Expand Down
7 changes: 3 additions & 4 deletions internal/simulation/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"github.com/nspcc-dev/dbft"
"github.com/nspcc-dev/dbft/internal/consensus"
"github.com/nspcc-dev/dbft/internal/crypto"
"github.com/twmb/murmur3"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -153,9 +152,9 @@

func sortValidators(pubs []dbft.PublicKey) {
slices.SortFunc(pubs, func(a, b dbft.PublicKey) int {
p1, _ := a.(*crypto.ECDSAPub).MarshalBinary()
p2, _ := b.(*crypto.ECDSAPub).MarshalBinary()
return int(murmur3.Sum64(p2)) - int(murmur3.Sum64(p1))
x := a.(*crypto.ECDSAPub)
y := b.(*crypto.ECDSAPub)
return x.Compare(y)

Check warning on line 157 in internal/simulation/main.go

View check run for this annotation

Codecov / codecov/patch

internal/simulation/main.go#L155-L157

Added lines #L155 - L157 were not covered by tests
})
}

Expand Down
Loading