From a194421e80010eb0a593fea14a32325df50d566f Mon Sep 17 00:00:00 2001
From: cancelloveyan <39250387+cancelloveyan@users.noreply.github.com>
Date: Tue, 16 Oct 2018 13:51:42 +0800
Subject: [PATCH] remove redundant code (#1400)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* 删除重复定义的变量代码

* 优化抽出公共代码
---
 account/builder.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/account/builder.go b/account/builder.go
index 69d53a52..8947a34d 100644
--- a/account/builder.go
+++ b/account/builder.go
@@ -324,17 +324,15 @@ func UtxoToInputs(signer *signers.Signer, u *UTXO) (*types.TxInput, *txbuilder.S
 		return nil, nil, err
 	}
 
+	sigInst.AddRawWitnessKeys(signer.XPubs, path, signer.Quorum)
+	derivedXPubs := chainkd.DeriveXPubs(signer.XPubs, path)
+
 	switch address.(type) {
 	case *common.AddressWitnessPubKeyHash:
-		sigInst.AddRawWitnessKeys(signer.XPubs, path, signer.Quorum)
-		derivedXPubs := chainkd.DeriveXPubs(signer.XPubs, path)
 		derivedPK := derivedXPubs[0].PublicKey()
 		sigInst.WitnessComponents = append(sigInst.WitnessComponents, txbuilder.DataWitness([]byte(derivedPK)))
 
 	case *common.AddressWitnessScriptHash:
-		sigInst.AddRawWitnessKeys(signer.XPubs, path, signer.Quorum)
-		path := signers.Path(signer, signers.AccountKeySpace, u.ControlProgramIndex)
-		derivedXPubs := chainkd.DeriveXPubs(signer.XPubs, path)
 		derivedPKs := chainkd.XPubKeys(derivedXPubs)
 		script, err := vmutil.P2SPMultiSigProgram(derivedPKs, signer.Quorum)
 		if err != nil {
-- 
2.11.0