renew

diff --git a/federation/federation.go b/federation/config/federation.go
similarity index 77%
rename from federation/federation.go
rename to federation/config/federation.go
index 1696b0f..3e5eaec 100644 (file)
--- a/federation/federation.go
+++ b/federation/config/federation.go
@@ -1,4 +1,4 @@
-package federation
+package config
 
 import (
        "sort"
@@ -6,11 +6,10 @@ import (
        log "github.com/sirupsen/logrus"
 
        "github.com/vapor/crypto/ed25519/chainkd"
-       "github.com/vapor/federation/config"
        "github.com/vapor/protocol/vm/vmutil"
 )
 
-func ParseFedProg(warders []config.Warder, quorum int) []byte {
+func ParseFedProg(warders []Warder, quorum int) []byte {
        SortWarders(warders)
 
        xpubs := []chainkd.XPub{}
@@ -26,13 +25,13 @@ func ParseFedProg(warders []config.Warder, quorum int) []byte {
        return fedpegScript
 }
 
-type ByPosition []config.Warder
+type ByPosition []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 []config.Warder) []config.Warder {
+func SortWarders(warders []Warder) []Warder {
        sort.Sort(ByPosition(warders))
        return warders
 }

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 69854f9..430308e 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -14,7 +14,6 @@ import (
        log "github.com/sirupsen/logrus"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation"
        "github.com/vapor/federation/common"
        "github.com/vapor/federation/config"
        "github.com/vapor/federation/database"
@@ -39,7 +38,7 @@ func NewMainchainKeeper(db *gorm.DB, assetStore *database.AssetStore, cfg *confi
                node:       service.NewNode(cfg.Mainchain.Upstream),
                chainName:  cfg.Mainchain.Name,
                assetStore: assetStore,
-               fedProg:    federation.ParseFedProg(cfg.Warders, cfg.Quorum),
+               fedProg:    config.ParseFedProg(cfg.Warders, cfg.Quorum),
        }
 }
 

diff --git a/federation/warder.go b/federation/warder.go
index a9e2d2c..92fef40 100644 (file)
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -41,7 +41,7 @@ func NewWarder(db *gorm.DB, assetStore *database.AssetStore, cfg *config.Config)
                db:            db,
                assetStore:    assetStore,
                txCh:          make(chan *orm.CrossTransaction),
-               fedProg:       ParseFedProg(cfg.Warders, cfg.Quorum),
+               fedProg:       config.ParseFedProg(cfg.Warders, cfg.Quorum),
                position:      local.Position,
                xpub:          local.XPub,
                xprv:          string2xprv(xprvStr),