clean

diff --git a/cmd/fedd/main.go b/cmd/fedd/main.go
index 20c5d47..3823b78 100644 (file)
--- a/cmd/fedd/main.go
+++ b/cmd/fedd/main.go
@@ -8,7 +8,6 @@ import (
        "github.com/vapor/federation"
        "github.com/vapor/federation/config"
        "github.com/vapor/federation/database"
-       "github.com/vapor/federation/service"
        "github.com/vapor/federation/synchron"
 )
 
@@ -21,7 +20,7 @@ func main() {
                log.WithField("err", err).Panic("initialize mysql db error")
        }
 
-       assetKeeper := service.NewAssetKeeper(db)
+       assetKeeper := database.NewAssetKeeper(db)
        go synchron.NewMainchainKeeper(db, assetKeeper, cfg).Run()
        go synchron.NewSidechainKeeper(db, assetKeeper, cfg).Run()
        go federation.NewWarder(db, assetKeeper, cfg).Run()

diff --git a/federation/service/asset_keeper.go b/federation/database/asset_keeper.go
similarity index 89%
rename from federation/service/asset_keeper.go
rename to federation/database/asset_keeper.go
index f3f817e..7b49ab4 100644 (file)
--- a/federation/service/asset_keeper.go
+++ b/federation/database/asset_keeper.go
@@ -1,23 +1,22 @@
-package service
+package database
 
 import (
        "github.com/jinzhu/gorm"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
 )
 
 // TODO:
 type AssetKeeper struct {
        db         *gorm.DB
-       assetCache *database.AssetCache
+       assetCache *AssetCache
 }
 
 func NewAssetKeeper(db *gorm.DB) *AssetKeeper {
        return &AssetKeeper{
                db:         db,
-               assetCache: database.NewAssetCache(),
+               assetCache: NewAssetCache(),
        }
 }
 

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 544b9ef..233a0f9 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -17,6 +17,7 @@ import (
        "github.com/vapor/federation"
        "github.com/vapor/federation/common"
        "github.com/vapor/federation/config"
+       "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
        "github.com/vapor/federation/service"
        "github.com/vapor/protocol/bc"
@@ -27,11 +28,11 @@ type mainchainKeeper struct {
        db          *gorm.DB
        node        *service.Node
        chainName   string
-       assetKeeper *service.AssetKeeper
+       assetKeeper *database.AssetKeeper
        fedProg     []byte
 }
 
-func NewMainchainKeeper(db *gorm.DB, assetKeeper *service.AssetKeeper, cfg *config.Config) *mainchainKeeper {
+func NewMainchainKeeper(db *gorm.DB, assetKeeper *database.AssetKeeper, cfg *config.Config) *mainchainKeeper {
        return &mainchainKeeper{
                cfg:         &cfg.Mainchain,
                db:          db,

diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go
index 5d92f7f..9414ad1 100644 (file)
--- a/federation/synchron/sidechain_keeper.go
+++ b/federation/synchron/sidechain_keeper.go
@@ -13,6 +13,7 @@ import (
        "github.com/vapor/errors"
        "github.com/vapor/federation/common"
        "github.com/vapor/federation/config"
+       "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
        "github.com/vapor/federation/service"
        "github.com/vapor/protocol/bc"
@@ -24,17 +25,16 @@ type sidechainKeeper struct {
        db          *gorm.DB
        node        *service.Node
        chainName   string
-       assetKeeper *service.AssetKeeper
+       assetKeeper *database.AssetKeeper
 }
 
-func NewSidechainKeeper(db *gorm.DB, assetKeeper *service.AssetKeeper, cfg *config.Config) *sidechainKeeper {
+func NewSidechainKeeper(db *gorm.DB, assetKeeper *database.AssetKeeper, cfg *config.Config) *sidechainKeeper {
        return &sidechainKeeper{
                cfg:         &cfg.Sidechain,
                db:          db,
                node:        service.NewNode(cfg.Sidechain.Upstream),
                chainName:   cfg.Sidechain.Name,
                assetKeeper: assetKeeper,
-               // assetCache: database.NewAssetCache(),
        }
 }
 

diff --git a/federation/warder.go b/federation/warder.go
index 1fd6cfa..e0ce9e3 100644 (file)
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -13,6 +13,7 @@ import (
        "github.com/vapor/errors"
        "github.com/vapor/federation/common"
        "github.com/vapor/federation/config"
+       "github.com/vapor/federation/database"
        "github.com/vapor/federation/database/orm"
        "github.com/vapor/federation/service"
        vaporBc "github.com/vapor/protocol/bc"
@@ -32,7 +33,7 @@ func string2xprv(str string) (xprv chainkd.XPrv) {
 
 type warder struct {
        db            *gorm.DB
-       assetKeeper   *service.AssetKeeper
+       assetKeeper   *database.AssetKeeper
        txCh          chan *orm.CrossTransaction
        fedProg       []byte
        position      uint8
@@ -43,7 +44,7 @@ type warder struct {
        remotes       []*service.Warder
 }
 
-func NewWarder(db *gorm.DB, assetKeeper *service.AssetKeeper, cfg *config.Config) *warder {
+func NewWarder(db *gorm.DB, assetKeeper *database.AssetKeeper, cfg *config.Config) *warder {
        local, remotes := parseWarders(cfg)
        return &warder{
                db:          db,