From 23ba43d30b27d3d427eb22ed6d25f1ed6c4ad63a Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <haoyu@protonmail.com>
Date: Mon, 17 Jun 2019 16:28:41 +0800
Subject: [PATCH] pause again

---
 federation/util/hash.go | 19 +++++++++++++++++++
 federation/warder.go    | 12 +++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 federation/util/hash.go

diff --git a/federation/util/hash.go b/federation/util/hash.go
new file mode 100644
index 00000000..070a0b0c
--- /dev/null
+++ b/federation/util/hash.go
@@ -0,0 +1,19 @@
+package util
+
+/*
+import (
+    ""
+)
+
+func stringToAssetID(s string) (*bc.AssetID, error) {
+	h, err := hex.DecodeString(s)
+	if err != nil {
+		return nil, errors.Wrap(err, "decode asset string")
+	}
+
+	var b [32]byte
+	copy(b[:], h)
+	assetID := bc.NewAssetID(b)
+	return &assetID, nil
+}
+*/
diff --git a/federation/warder.go b/federation/warder.go
index 875aeea6..dd148775 100644
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -14,8 +14,8 @@ import (
 	"github.com/vapor/federation/config"
 	"github.com/vapor/federation/database/orm"
 	"github.com/vapor/federation/service"
-    vaporBc "github.com/vapor/protocol/bc"
-    vaporTypes "github.com/vapor/protocol/bc/types"
+	// vaporBc "github.com/vapor/protocol/bc"
+	vaporTypes "github.com/vapor/protocol/bc/types"
 )
 
 var collectInterval = 5 * time.Second
@@ -179,9 +179,11 @@ func (w *warder) buildSidechainTx(ormTx *orm.CrossTransaction) (*vaporTypes.Tx,
 	destTxData := &vaporTypes.TxData{Version: 1, TimeRange: 0}
 	// signInsts := []*SigningInstruction{}
 
-	for _, req := range ormTx.Reqs {
-		txInput := vaporTypes.NewCrossChainInput(nil, vaporBc.Hash{}, vaporBc.AssetID{}, amount,sourcePos uint64, controlProgram, assetDefinition []byte)
-	}
+	// for _, req := range ormTx.Reqs {
+	//        muxID := vaporBc.Hash{}
+
+	// 	txInput := vaporTypes.NewCrossChainInput(nil, muxID, vaporBc.AssetID{}, amount,sourcePos uint64, controlProgram, assetDefinition []byte)
+	// }
 
 	// for?{
 
-- 
2.11.0