Clean pending files from rebase

lib/sigs/delegated/init.go

@@ -1,57 +0,0 @@
-package delegated
-
-import (
-	"fmt"
-
-	"golang.org/x/crypto/sha3"
-
-	"github.com/filecoin-project/go-address"
-	gocrypto "github.com/filecoin-project/go-crypto"
-	crypto1 "github.com/filecoin-project/go-state-types/crypto"
-
-	"github.com/filecoin-project/lotus/lib/sigs"
-)
-
-type delegatedSigner struct{}
-
-func (delegatedSigner) GenPrivate() ([]byte, error) {
-	priv, err := gocrypto.GenerateKey()
-	if err != nil {
-		return nil, err
-	}
-	return priv, nil
-}
-
-func (delegatedSigner) ToPublic(pk []byte) ([]byte, error) {
-	return gocrypto.PublicKey(pk), nil
-}
-
-func (delegatedSigner) Sign(pk []byte, msg []byte) ([]byte, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func (delegatedSigner) Verify(sig []byte, a address.Address, msg []byte) error {
-	hasher := sha3.NewLegacyKeccak256()
-	hasher.Write(msg)
-	hash := hasher.Sum(nil)
-
-	pubk, err := gocrypto.EcRecover(hash, sig)
-	if err != nil {
-		return err
-	}
-
-	maybeaddr, err := address.NewSecp256k1Address(pubk)
-	if err != nil {
-		return err
-	}
-
-	if maybeaddr != a {
-		return fmt.Errorf("signature did not match")
-	}
-
-	return nil
-}
-
-func init() {
-	sigs.RegisterSignature(crypto1.SigTypeDelegated, delegatedSigner{})
-}

lib/sigs/secp/init.go

@@ -6,7 +6,7 @@ import (
 	"github.com/minio/blake2b-simd"
 
 	"github.com/filecoin-project/go-address"
-	gocrypto "github.com/filecoin-project/go-crypto"
+	crypto "github.com/filecoin-project/go-crypto"
 	crypto2 "github.com/filecoin-project/go-state-types/crypto"
 
 	"github.com/filecoin-project/lotus/lib/sigs"
@@ -15,7 +15,7 @@ import (
 type secpSigner struct{}
 
 func (secpSigner) GenPrivate() ([]byte, error) {
-	priv, err := gocrypto.GenerateKey()
+	priv, err := crypto.GenerateKey()
 	if err != nil {
 		return nil, err
 	}
@@ -23,12 +23,12 @@ func (secpSigner) GenPrivate() ([]byte, error) {
 }
 
 func (secpSigner) ToPublic(pk []byte) ([]byte, error) {
-	return gocrypto.PublicKey(pk), nil
+	return crypto.PublicKey(pk), nil
 }
 
 func (secpSigner) Sign(pk []byte, msg []byte) ([]byte, error) {
 	b2sum := blake2b.Sum256(msg)
-	sig, err := gocrypto.Sign(pk, b2sum[:])
+	sig, err := crypto.Sign(pk, b2sum[:])
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +38,7 @@ func (secpSigner) Sign(pk []byte, msg []byte) ([]byte, error) {
 
 func (secpSigner) Verify(sig []byte, a address.Address, msg []byte) error {
 	b2sum := blake2b.Sum256(msg)
-	pubk, err := gocrypto.EcRecover(b2sum[:], sig)
+	pubk, err := crypto.EcRecover(b2sum[:], sig)
 	if err != nil {
 		return err
 	}