From ea99f128554f8a5b72b8622dc04367d534db80e4 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Sat, 15 Jun 2019 11:06:47 +0800 Subject: [PATCH] add --- cmd/fedd/main.go | 4 ++-- federation/synchron/mainchain_keeper.go | 4 +++- federation/synchron/sidechain_keeper.go | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/fedd/main.go b/cmd/fedd/main.go index f59557db..41304881 100644 --- a/cmd/fedd/main.go +++ b/cmd/fedd/main.go @@ -20,8 +20,8 @@ func main() { } txCh := make(chan *orm.CrossTransaction) - go synchron.NewMainchainKeeper(db, &cfg.Mainchain).Run() - go synchron.NewSidechainKeeper(db, &cfg.Sidechain).Run() + go synchron.NewMainchainKeeper(db, &cfg.Mainchain, txCh).Run() + go synchron.NewSidechainKeeper(db, &cfg.Sidechain, txCh).Run() go federation.NewWarder(txCh).Run() // keep the main func running in case of terminating goroutines diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go index 50f7a039..e0cfc93d 100644 --- a/federation/synchron/mainchain_keeper.go +++ b/federation/synchron/mainchain_keeper.go @@ -31,15 +31,17 @@ type mainchainKeeper struct { node *service.Node chainName string assetCache *database.AssetCache + txCh chan *orm.CrossTransaction } -func NewMainchainKeeper(db *gorm.DB, chainCfg *config.Chain) *mainchainKeeper { +func NewMainchainKeeper(db *gorm.DB, chainCfg *config.Chain, txCh chan *orm.CrossTransaction) *mainchainKeeper { return &mainchainKeeper{ cfg: chainCfg, db: db, node: service.NewNode(chainCfg.Upstream), chainName: chainCfg.Name, assetCache: database.NewAssetCache(), + txCh: txCh, } } diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go index fed458e7..5da38bc4 100644 --- a/federation/synchron/sidechain_keeper.go +++ b/federation/synchron/sidechain_keeper.go @@ -26,15 +26,17 @@ type sidechainKeeper struct { node *service.Node chainName string assetCache *database.AssetCache + txCh chan *orm.CrossTransaction } -func NewSidechainKeeper(db *gorm.DB, chainCfg *config.Chain) *sidechainKeeper { +func NewSidechainKeeper(db *gorm.DB, chainCfg *config.Chain, txCh chan *orm.CrossTransaction) *sidechainKeeper { return &sidechainKeeper{ cfg: chainCfg, db: db, node: service.NewNode(chainCfg.Upstream), chainName: chainCfg.Name, assetCache: database.NewAssetCache(), + txCh: txCh, } } -- 2.11.0