clean

diff --git a/cmd/fedd/main.go b/cmd/fedd/main.go
index 3c2dd31..13b5563 100644 (file)
--- a/cmd/fedd/main.go
+++ b/cmd/fedd/main.go
@@ -19,9 +19,9 @@ func main() {
        }
 
        // TODO: refactor
-       go synchron.NewMainchainKeeper(db, &cfg.Mainchain, cfg.Warders, cfg.Quorum).Run()
-       go synchron.NewSidechainKeeper(db, &cfg.Sidechain).Run()
-       go federation.NewWarder(cfg, db).Run()
+       go synchron.NewMainchainKeeper(db, cfg).Run()
+       go synchron.NewSidechainKeeper(db, cfg).Run()
+       go federation.NewWarder(db, cfg).Run()
 
        // keep the main func running in case of terminating goroutines
        var wg sync.WaitGroup

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 33ce5f6..b2f98b3 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -32,14 +32,14 @@ type mainchainKeeper struct {
        fedProg    []byte
 }
 
-func NewMainchainKeeper(db *gorm.DB, chainCfg *config.Chain, warders []config.Warder, quorum int) *mainchainKeeper {
+func NewMainchainKeeper(db *gorm.DB, cfg *config.Config) *mainchainKeeper {
        return &mainchainKeeper{
-               cfg:        chainCfg,
+               cfg:        &cfg.Mainchain,
                db:         db,
-               node:       service.NewNode(chainCfg.Upstream),
-               chainName:  chainCfg.Name,
+               node:       service.NewNode(cfg.Mainchain.Upstream),
+               chainName:  cfg.Mainchain.Name,
                assetCache: database.NewAssetCache(),
-               fedProg:    federation.ParseFedProg(warders, quorum),
+               fedProg:    federation.ParseFedProg(cfg.Warders, cfg.Quorum),
        }
 }
 

diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go
index fed458e..9f852fa 100644 (file)
--- a/federation/synchron/sidechain_keeper.go
+++ b/federation/synchron/sidechain_keeper.go
@@ -28,12 +28,12 @@ type sidechainKeeper struct {
        assetCache *database.AssetCache
 }
 
-func NewSidechainKeeper(db *gorm.DB, chainCfg *config.Chain) *sidechainKeeper {
+func NewSidechainKeeper(db *gorm.DB, cfg *config.Config) *sidechainKeeper {
        return &sidechainKeeper{
-               cfg:        chainCfg,
+               cfg:        &cfg.Sidechain,
                db:         db,
-               node:       service.NewNode(chainCfg.Upstream),
-               chainName:  chainCfg.Name,
+               node:       service.NewNode(cfg.Sidechain.Upstream),
+               chainName:  cfg.Sidechain.Name,
                assetCache: database.NewAssetCache(),
        }
 }

diff --git a/federation/warder.go b/federation/warder.go
index 90f875e..5603dc9 100644 (file)
--- a/federation/warder.go
+++ b/federation/warder.go
@@ -40,7 +40,7 @@ type warder struct {
        remotes        []*service.Warder
 }
 
-func NewWarder(cfg *config.Config, db *gorm.DB) *warder {
+func NewWarder(db *gorm.DB, cfg *config.Config) *warder {
        local, remotes := parseWarders(cfg)
        return &warder{
                position: local.Position,