fix

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 3a82451..2909f3c 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -19,6 +19,7 @@ import (
        "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
        "github.com/vapor/federation/service"
+       "github.com/vapor/federation/util"
        "github.com/vapor/protocol/bc"
 )
 
@@ -38,7 +39,7 @@ func NewMainchainKeeper(db *gorm.DB, assetStore *database.AssetStore, cfg *confi
                node:       service.NewNode(cfg.Mainchain.Upstream),
                chainName:  cfg.Mainchain.Name,
                assetStore: assetStore,
-               fedProg:    config.ParseFedProg(cfg.Warders, cfg.Quorum),
+               fedProg:    util.ParseFedProg(cfg.Warders, cfg.Quorum),
        }
 }
 

diff --git a/federation/config/federation.go b/federation/util/script.go
similarity index 82%
rename from federation/config/federation.go
rename to federation/util/script.go
index a002dcd..27d2665 100644 (file)
--- a/federation/config/federation.go
+++ b/federation/util/script.go
@@ -1,4 +1,4 @@
-package config
+package util
 
 import (
        "sort"
@@ -7,6 +7,7 @@ import (
 
        "github.com/vapor/crypto"
        "github.com/vapor/crypto/ed25519/chainkd"
+       "github.com/vapor/federation/config"
        "github.com/vapor/protocol/vm/vmutil"
 )
 
@@ -20,7 +21,7 @@ func SegWitWrap(script []byte) []byte {
        return wscript
 }
 
-func ParseFedProg(warders []Warder, quorum int) []byte {
+func ParseFedProg(warders []config.Warder, quorum int) []byte {
        SortWarders(warders)
 
        xpubs := []chainkd.XPub{}
@@ -36,13 +37,13 @@ func ParseFedProg(warders []Warder, quorum int) []byte {
        return fedScript
 }
 
-type byPosition []Warder
+type byPosition []config.Warder
 
 func (w byPosition) Len() int           { return len(w) }
 func (w byPosition) Swap(i, j int)      { w[i], w[j] = w[j], w[i] }
 func (w byPosition) Less(i, j int) bool { return w[i].Position < w[j].Position }
 
-func SortWarders(warders []Warder) []Warder {
+func SortWarders(warders []config.Warder) []config.Warder {
        sort.Sort(byPosition(warders))
        return warders
 }

diff --git a/federation/warder.go b/federation/warder.go
index 3238171..dc11f3d 100644 (file)
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -16,6 +16,7 @@ import (
        "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
        "github.com/vapor/federation/service"
+       "github.com/vapor/federation/util"
        vaporBc "github.com/vapor/protocol/bc"
        vaporTypes "github.com/vapor/protocol/bc/types"
 )
@@ -41,7 +42,7 @@ func NewWarder(db *gorm.DB, assetStore *database.AssetStore, cfg *config.Config)
                db:            db,
                assetStore:    assetStore,
                txCh:          make(chan *orm.CrossTransaction),
-               fedProg:       config.ParseFedProg(cfg.Warders, cfg.Quorum),
+               fedProg:       util.ParseFedProg(cfg.Warders, cfg.Quorum),
                position:      local.Position,
                xpub:          local.XPub,
                xprv:          string2xprv(xprvStr),