rename

Author: sparx7783

keys.go

@@ -72,10 +72,14 @@ func ValidatePrivateKey(b []byte) (bool, error) {
 	if len(b) != voied25519.PrivateKeySize {
 		return false, fmt.Errorf("invalid private key size, expected %v, got %d", voied25519.PrivateKeySize, len(b))
 	}
+<<<<<<< HEAD
 	// check if the public key is on the ed25519 curve
+=======
+	// check if the public key is on the voied25519 curve
+>>>>>>> f4f19e0 (rename)
 	pub := voied25519.PrivateKey(b).Public().(voied25519.PublicKey)
 	if !IsOnCurve(pub) {
-		return false, errors.New("the corresponding public key is NOT on the ed25519 curve")
+		return false, errors.New("the corresponding public key is NOT on the voied25519 curve")
 	}
 	return true, nil
 }
@@ -152,7 +156,11 @@ func (k PrivateKey) PublicKey() PublicKey {
 // PK is a convenience alias for PublicKey
 type PK = PublicKey
 
+<<<<<<< HEAD
 // done to keep verify the same as stdlib crypto/ed25519
+=======
+// done to keep verify the same as stdlib crypto/voied25519
+>>>>>>> f4f19e0 (rename)
 var verifyOptsStdLib = &voied25519.Options{
 	Verify: voied25519.VerifyOptionsStdLib,
 }
@@ -300,7 +308,7 @@ func (p PublicKey) Bytes() []byte {
 	return []byte(p[:])
 }
 
-// Check if a `Pubkey` is on the ed25519 curve.
+// Check if a `Pubkey` is on the voied25519 curve.
 func (p PublicKey) IsOnCurve() bool {
 	return IsOnCurve(p[:])
 }

nativetypes.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/oasisprotocol/curve25519-voi/primitives/ed25519"
+	voied25519 "github.com/oasisprotocol/curve25519-voi/primitives/ed25519"
 
 	bin "github.com/gagliardetto/binary"
 	"github.com/gagliardetto/solana-go/base58"
@@ -187,7 +187,7 @@ func (p *Signature) UnmarshalJSON(data []byte) (err error) {
 
 // Verify checks that the signature is valid for the given public key and message.
 func (s Signature) Verify(pubkey PublicKey, msg []byte) bool {
-	return ed25519.VerifyWithOptions(pubkey[:], msg, s[:], verifyOptsStdLib)
+	return voied25519.VerifyWithOptions(pubkey[:], msg, s[:], verifyOptsStdLib)
 }
 
 func (p Signature) String() string {