X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=api%2Fhsm.go;h=fb2b4e68f82547c635da357615db892972987b7c;hb=5f9994ca49618c1336d4490e9a4410c6b8784be1;hp=96b968e5f430ce75c82e57607988bacda87a2dc3;hpb=a795c2c4f52973630972ba062716fb40b7016c46;p=bytom%2Fvapor.git

diff --git a/api/hsm.go b/api/hsm.go
index 96b968e5..fb2b4e68 100644
--- a/api/hsm.go
+++ b/api/hsm.go
@@ -6,9 +6,6 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/vapor/blockchain/txbuilder"
-	"github.com/vapor/common"
-	"github.com/vapor/consensus"
-	"github.com/vapor/crypto"
 	"github.com/vapor/crypto/ed25519/chainkd"
 )
 
@@ -75,7 +72,7 @@ func (a *API) signTemplate(ctx context.Context, x struct {
 	Password string             `json:"password"`
 	Txs      txbuilder.Template `json:"transaction"`
 }) Response {
-	if err := txbuilder.Sign(ctx, &x.Txs, x.Password, a.PseudohsmSignTemplate); err != nil {
+	if err := txbuilder.Sign(ctx, &x.Txs, x.Password, a.pseudohsmSignTemplate); err != nil {
 		log.WithField("build err", err).Error("fail on sign transaction.")
 		return NewErrorResponse(err)
 	}
@@ -94,7 +91,7 @@ func (a *API) signTemplates(ctx context.Context, x struct {
 }) Response {
 	signComplete := true
 	for _, tx := range x.Txs {
-		if err := txbuilder.Sign(ctx, tx, x.Password, a.PseudohsmSignTemplate); err != nil {
+		if err := txbuilder.Sign(ctx, tx, x.Password, a.pseudohsmSignTemplate); err != nil {
 			log.WithField("build err", err).Error("fail on sign transaction.")
 			return NewErrorResponse(err)
 		}
@@ -105,7 +102,7 @@ func (a *API) signTemplates(ctx context.Context, x struct {
 	return NewSuccessResponse(&signTemplatesResp{Tx: x.Txs, SignComplete: signComplete})
 }
 
-func (a *API) PseudohsmSignTemplate(ctx context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
+func (a *API) pseudohsmSignTemplate(ctx context.Context, xpub chainkd.XPub, path [][]byte, data [32]byte, password string) ([]byte, error) {
 	return a.wallet.Hsm.XSign(xpub, path, data[:], password)
 }
 
@@ -143,25 +140,3 @@ func (a *API) pseudohsmCheckPassword(ctx context.Context, ins struct {
 	resp.CheckResult = true
 	return NewSuccessResponse(resp)
 }
-
-type keyPair struct {
-	Xpub    chainkd.XPub `json:"xpub"`
-	Xprv    chainkd.XPrv `json:"xprv"`
-	Address string       `json:"address,omitempty"`
-}
-
-func (a *API) createXKeys(ctx context.Context) Response {
-	xprv, xpub, err := chainkd.NewXKeys(nil)
-	if err != nil {
-		return NewErrorResponse(err)
-	}
-
-	pubHash := crypto.Ripemd160(xpub.PublicKey())
-
-	address, err := common.NewAddressWitnessPubKeyHash(pubHash, &consensus.ActiveNetParams)
-	if err != nil {
-		return NewErrorResponse(err)
-	}
-
-	return NewSuccessResponse(&keyPair{Xprv: xprv, Xpub: xpub, Address: address.EncodeAddress()})
-}