clean

diff --git a/federation/common/const.go b/federation/common/const.go
index 0a91d33..e843f9e 100644 (file)
--- a/federation/common/const.go
+++ b/federation/common/const.go
@@ -1,9 +1,5 @@
 package common
 
-import (
-       "github.com/vapor/errors"
-)
-
 const (
        CrossTxPendingStatus uint8 = iota
        CrossTxRejectedStatus
@@ -16,5 +12,3 @@ const (
        CrossTxSignCompletedStatus
        CrossTxSignRejectedStatus
 )
-
-var ErrInconsistentDB = errors.New("inconsistent db status")

diff --git a/federation/synchron/commob.go b/federation/synchron/commob.go
new file mode 100644 (file)
index 0000000..cef5c62
--- /dev/null
+++ b/federation/synchron/commob.go
@@ -0,0 +1,7 @@
+package synchron
+
+import (
+       "github.com/vapor/errors"
+)
+
+var ErrInconsistentDB = errors.New("inconsistent db status")

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 13a315f..a7e7e75 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -90,7 +90,7 @@ func (m *mainchainKeeper) syncBlock() (bool, error) {
                        "remote PreviousBlockHash": nextBlock.PreviousBlockHash.String(),
                        "db block_hash":            chain.BlockHash,
                }).Fatal("BlockHash mismatch")
-               return false, common.ErrInconsistentDB
+               return false, ErrInconsistentDB
        }
 
        if err := m.tryAttachBlock(chain, nextBlock, txStatus); err != nil {
@@ -262,7 +262,7 @@ func (m *mainchainKeeper) processChainInfo(chain *orm.Chain, block *types.Block)
        }
 
        if res.RowsAffected != 1 {
-               return common.ErrInconsistentDB
+               return ErrInconsistentDB
        }
 
        return nil

diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go
index 577a6e0..18ec269 100644 (file)
--- a/federation/synchron/sidechain_keeper.go
+++ b/federation/synchron/sidechain_keeper.go
@@ -85,7 +85,7 @@ func (s *sidechainKeeper) syncBlock() (bool, error) {
                        "remote PreviousBlockHash": nextBlock.PreviousBlockHash.String(),
                        "db block_hash":            chain.BlockHash,
                }).Fatal("BlockHash mismatch")
-               return false, common.ErrInconsistentDB
+               return false, ErrInconsistentDB
        }
 
        if err := s.tryAttachBlock(chain, nextBlock, txStatus); err != nil {
@@ -253,7 +253,7 @@ func (s *sidechainKeeper) processChainInfo(chain *orm.Chain, block *types.Block)
        }
 
        if res.RowsAffected != 1 {
-               return common.ErrInconsistentDB
+               return ErrInconsistentDB
        }
 
        return nil