Merge pull request #1366 from oasisprotocol/kostko/fix/csdk-go-pk-equ…

…al-ptr

client-sdk/go/crypto: Fix public key comparison for pointer variants

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Default code owners.
-* @kostko @pro-wh @ptrus @nhynes
+* @kostko @pro-wh @ptrus

client-sdk/go/crypto/signature/ed25519/ed25519.go

@@ -45,11 +45,16 @@ func (pk PublicKey) String() string {
 
 // Equal compares vs another public key for equality.
 func (pk PublicKey) Equal(other sdkSignature.PublicKey) bool {
-	opk, ok := other.(PublicKey)
-	if !ok {
+	var opk *PublicKey
+	switch otherPk := other.(type) {
+	case PublicKey:
+		opk = &otherPk
+	case *PublicKey:
+		opk = otherPk
+	default:
 		return false
 	}
-	return (signature.PublicKey)(pk).Equal((signature.PublicKey)(opk))
+	return (signature.PublicKey)(pk).Equal((signature.PublicKey)(*opk))
 }
 
 // Verify returns true iff the signature is valid for the public key over the context and message.

client-sdk/go/crypto/signature/ed25519/ed25519_test.go

@@ -0,0 +1,27 @@
+package ed25519
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestEd25519Equal(t *testing.T) {
+	require := require.New(t)
+
+	pk1 := NewPublicKey("YgkEiVSR4SMQdfXw+ppuFYlqH0seutnCKk8KG8PyAx0=")
+	pk2 := NewPublicKey("NcPzNW3YU2T+ugNUtUWtoQnRvbOL9dYSaBfbjHLP1pE=")
+	pk3 := NewPublicKey("YgkEiVSR4SMQdfXw+ppuFYlqH0seutnCKk8KG8PyAx0=")
+
+	require.True(pk1.Equal(pk1)) //nolint: gocritic
+	require.True(pk1.Equal(&pk1))
+	require.True(pk1.Equal(pk3))
+	require.True(pk1.Equal(&pk3))
+	require.True(pk3.Equal(pk3)) //nolint: gocritic
+	require.True(pk3.Equal(&pk3))
+	require.True(pk3.Equal(pk1))
+	require.True(pk3.Equal(&pk1))
+
+	require.False(pk1.Equal(pk2))
+	require.False(pk1.Equal(&pk2))
+}

client-sdk/go/crypto/signature/secp256k1/secp256k1.go

@@ -57,11 +57,16 @@ func (pk PublicKey) String() string {
 
 // Equal compares vs another public key for equality.
 func (pk PublicKey) Equal(other sdkSignature.PublicKey) bool {
-	opk, ok := other.(PublicKey)
-	if !ok {
+	var opk *PublicKey
+	switch otherPk := other.(type) {
+	case PublicKey:
+		opk = &otherPk
+	case *PublicKey:
+		opk = otherPk
+	default:
 		return false
 	}
-	obpk := btcec.PublicKey(opk)
+	obpk := btcec.PublicKey(*opk)
 	bpk := btcec.PublicKey(pk)
 	return bpk.IsEqual(&obpk)
 }

client-sdk/go/crypto/signature/secp256k1/secp256k1_test.go

@@ -148,3 +148,23 @@ func TestSecp256k1Reset(t *testing.T) {
 	ver2 := s.Public().Verify(ctx1.Derive(), msg1, sig1)
 	require.False(ver2, "verification should fail after reset")
 }
+
+func TestSecp256k1Equal(t *testing.T) {
+	require := require.New(t)
+
+	pk1 := NewPublicKey("AwF6GNjbybMzhi3XRj5R1oTiMMkO1nAwB7NZAlH1X4BE")
+	pk2 := NewPublicKey("A9i0oSK+5sLSONbMYGmaFUA+Fb8zzqYEMUMspacIgO09")
+	pk3 := NewPublicKey("AwF6GNjbybMzhi3XRj5R1oTiMMkO1nAwB7NZAlH1X4BE")
+
+	require.True(pk1.Equal(pk1)) //nolint: gocritic
+	require.True(pk1.Equal(&pk1))
+	require.True(pk1.Equal(pk3))
+	require.True(pk1.Equal(&pk3))
+	require.True(pk3.Equal(pk3)) //nolint: gocritic
+	require.True(pk3.Equal(&pk3))
+	require.True(pk3.Equal(pk1))
+	require.True(pk3.Equal(&pk1))
+
+	require.False(pk1.Equal(pk2))
+	require.False(pk1.Equal(&pk2))
+}

client-sdk/go/crypto/signature/sr25519/sr25519.go

@@ -59,8 +59,13 @@ func (pk PublicKey) String() string {
 
 // Equal compares vs another public key for equality.
 func (pk PublicKey) Equal(other signature.PublicKey) bool {
-	opk, ok := other.(PublicKey)
-	if !ok {
+	var opk *PublicKey
+	switch otherPk := other.(type) {
+	case PublicKey:
+		opk = &otherPk
+	case *PublicKey:
+		opk = otherPk
+	default:
 		return false
 	}
 	if pk.inner == nil && opk.inner != nil || pk.inner != nil && opk.inner == nil {
@@ -95,3 +100,12 @@ func newSigningTranscript(context, message []byte) *sr25519.SigningTranscript {
 
 	return signingContext.NewTranscriptHash(h)
 }
+
+// NewPublicKey creates a new public key from the given Base64 representation or
+// panics.
+func NewPublicKey(text string) (pk PublicKey) {
+	if err := pk.UnmarshalText([]byte(text)); err != nil {
+		panic(err)
+	}
+	return
+}

client-sdk/go/crypto/signature/sr25519/sr25519_test.go

@@ -0,0 +1,27 @@
+package sr25519
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestSr25519Equal(t *testing.T) {
+	require := require.New(t)
+
+	pk1 := NewPublicKey("ljm9ZwdAldhlyWM2B4C+3gQZis+ceaxnt6QA4rOcP0k=")
+	pk2 := NewPublicKey("0MHrNhjVTOFWmsOgpWcC3L8jIX3ZatKr0/yxMPtwckc=")
+	pk3 := NewPublicKey("ljm9ZwdAldhlyWM2B4C+3gQZis+ceaxnt6QA4rOcP0k=")
+
+	require.True(pk1.Equal(pk1)) //nolint: gocritic
+	require.True(pk1.Equal(&pk1))
+	require.True(pk1.Equal(pk3))
+	require.True(pk1.Equal(&pk3))
+	require.True(pk3.Equal(pk3)) //nolint: gocritic
+	require.True(pk3.Equal(&pk3))
+	require.True(pk3.Equal(pk1))
+	require.True(pk3.Equal(&pk1))
+
+	require.False(pk1.Equal(pk2))
+	require.False(pk1.Equal(&pk2))
+}