From 960052a3eb3cbcb20d7cd49c5f61b1d47c59f03a Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Fri, 28 Jun 2019 22:00:01 +0800
Subject: [PATCH] rename

---
 blockchain/txbuilder/actions.go         |  2 +-
 config/genesis.go                       | 14 +++++++-------
 federation/synchron/mainchain_keeper.go |  2 +-
 federation/util/script.go               | 20 ++++++++------------
 node/node.go                            |  4 ++--
 protocol/validation/tx.go               |  2 +-
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index c13f16b2..1b72c7d8 100644
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -294,7 +294,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) err
 	tplIn := &SigningInstruction{}
 	fed := cfg.CommonConfig.Federation
 	tplIn.AddRawWitnessKeys(fed.Xpubs, nil, fed.Quorum)
-	tplIn.AddDataWitness(cfg.FederationP2SPMultiSigProgram(cfg.CommonConfig))
+	tplIn.AddDataWitness(cfg.FederationPMultiSigScript(cfg.CommonConfig))
 	return builder.AddInput(txin, tplIn)
 }
 
diff --git a/config/genesis.go b/config/genesis.go
index 3b94cf11..b7e2a0d5 100644
--- a/config/genesis.go
+++ b/config/genesis.go
@@ -13,7 +13,7 @@ import (
 	"github.com/vapor/protocol/vm/vmutil"
 )
 
-func FederationP2SPMultiSigProgram(c *Config) []byte {
+func FederationPMultiSigScript(c *Config) []byte {
 	xpubs := c.Federation.Xpubs
 	program, err := vmutil.P2SPMultiSigProgram(chainkd.XPubKeys(xpubs), c.Federation.Quorum)
 	if err != nil {
@@ -23,15 +23,15 @@ func FederationP2SPMultiSigProgram(c *Config) []byte {
 	return program
 }
 
-func FederationP2WSHProgram(c *Config) []byte {
-	program := FederationP2SPMultiSigProgram(c)
-	scriptHash := crypto.Sha256(program)
-	WSHProgram, err := vmutil.P2WSHProgram(scriptHash)
+func FederationWScript(c *Config) []byte {
+	script := FederationPMultiSigScript(c)
+	scriptHash := crypto.Sha256(script)
+	wscript, err := vmutil.P2WSHProgram(scriptHash)
 	if err != nil {
 		log.Panicf("Fail converts scriptHash to witness: %v", err)
 	}
 
-	return WSHProgram
+	return wscript
 }
 
 func GenesisTx() *types.Tx {
@@ -40,7 +40,7 @@ func GenesisTx() *types.Tx {
 		log.Panicf("fail on decode genesis tx output control program")
 	}
 
-	coinbaseInput := FederationP2WSHProgram(CommonConfig)
+	coinbaseInput := FederationPMultiSigScript(CommonConfig)
 
 	txData := types.TxData{
 		Version: 1,
diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 3b4da044..0c1612c0 100644
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -42,7 +42,7 @@ func NewMainchainKeeper(db *gorm.DB, assetStore *database.AssetStore, cfg *confi
 		node:       service.NewNode(cfg.Mainchain.Upstream),
 		chainName:  cfg.Mainchain.Name,
 		assetStore: assetStore,
-		fedProg:    util.SegWitWrap(util.ParseFedProg(cfg.Warders, cfg.Quorum)),
+		fedProg:    util.ParseFedProg(cfg.Warders, cfg.Quorum),
 	}
 }
 
diff --git a/federation/util/script.go b/federation/util/script.go
index 670b9802..76d498ee 100644
--- a/federation/util/script.go
+++ b/federation/util/script.go
@@ -11,16 +11,6 @@ import (
 	"github.com/vapor/protocol/vm/vmutil"
 )
 
-func SegWitWrap(script []byte) []byte {
-	scriptHash := crypto.Sha256(script)
-	wscript, err := vmutil.P2WSHProgram(scriptHash)
-	if err != nil {
-		log.Panicf("Fail converts scriptHash to witness: %v", err)
-	}
-
-	return wscript
-}
-
 func ParseFedProg(warders []config.Warder, quorum int) []byte {
 	SortWarders(warders)
 
@@ -29,12 +19,18 @@ func ParseFedProg(warders []config.Warder, quorum int) []byte {
 		xpubs = append(xpubs, w.XPub)
 	}
 
-	fedScript, err := vmutil.P2SPMultiSigProgram(chainkd.XPubKeys(xpubs), quorum)
+	scirpt, err := vmutil.P2SPMultiSigProgram(chainkd.XPubKeys(xpubs), quorum)
 	if err != nil {
 		log.Panicf("fail to generate federation scirpt for federation: %v", err)
 	}
 
-	return fedScript
+	scriptHash := crypto.Sha256(scirpt)
+	wscript, err := vmutil.P2WSHProgram(scriptHash)
+	if err != nil {
+		log.Panicf("Fail converts scriptHash to witness: %v", err)
+	}
+
+	return wscript
 }
 
 type byPosition []config.Warder
diff --git a/node/node.go b/node/node.go
index d737d22f..d82c1558 100644
--- a/node/node.go
+++ b/node/node.go
@@ -71,7 +71,7 @@ func NewNode(config *cfg.Config) *Node {
 		"pubkey":             config.PrivateKey().XPub(),
 		"fed_xpubs":          config.Federation.Xpubs,
 		"fed_quorum":         config.Federation.Quorum,
-		"fed_controlprogram": hex.EncodeToString(cfg.FederationP2WSHProgram(config)),
+		"fed_controlprogram": hex.EncodeToString(cfg.FederationWScript(config)),
 	}).Info()
 
 	initLogFile(config)
@@ -161,7 +161,7 @@ func NewNode(config *cfg.Config) *Node {
 
 // find whether config xpubs equal genesis block xpubs
 func checkConfig(chain *protocol.Chain, config *cfg.Config) error {
-	fedpegScript := cfg.FederationP2WSHProgram(config)
+	fedpegScript := cfg.FederationWScript(config)
 	genesisBlock, err := chain.GetBlockByHeight(0)
 	if err != nil {
 		return err
diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go
index f6fbb68b..58bbfc58 100644
--- a/protocol/validation/tx.go
+++ b/protocol/validation/tx.go
@@ -257,7 +257,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
 			return errors.New("incorrect asset_id while checking CrossChainInput")
 		}
 
-		code := config.FederationP2WSHProgram(config.CommonConfig)
+		code := config.FederationWScript(config.CommonConfig)
 		prog := &bc.Program{
 			VmVersion: e.ControlProgram.VmVersion,
 			Code:      code,
-- 
2.11.0