fix https://github.com/Bytom/vapor/pull/170#discussion_r293642418

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 0fe7fab..a622b97 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -247,11 +247,14 @@ func (m *mainchainKeeper) processWithdrawalTx(chain *orm.Chain, block *types.Blo
                DestTxIndex:     sql.NullInt64{int64(txIndex), true},
                Status:          common.CrossTxCompletedStatus,
        })
+       if stmt.Error != nil {
+               return stmt.Error
+       }
+
        if stmt.RowsAffected != 1 {
                log.Warn("row affected != 1, stmt:", stmt)
-               return ErrInconsistentDB
        }
-       return stmt.Error
+       return nil
 }
 
 func (m *mainchainKeeper) processChainInfo(chain *orm.Chain, block *types.Block) error {

diff --git a/federation/synchron/sidechain_keeper.go b/federation/synchron/sidechain_keeper.go
index 5d8bae6..0f4151a 100644 (file)
--- a/federation/synchron/sidechain_keeper.go
+++ b/federation/synchron/sidechain_keeper.go
@@ -155,11 +155,14 @@ func (s *sidechainKeeper) processDepositTx(chain *orm.Chain, block *types.Block,
                DestTxIndex:     sql.NullInt64{int64(txIndex), true},
                Status:          common.CrossTxCompletedStatus,
        })
+       if stmt.Error != nil {
+               return stmt.Error
+       }
+
        if stmt.RowsAffected != 1 {
                log.Warn("row affected != 1, stmt:", stmt)
-               return ErrInconsistentDB
        }
-       return stmt.Error
+       return nil
 }
 
 func (s *sidechainKeeper) processWithdrawalTx(chain *orm.Chain, block *types.Block, txStatus *bc.TransactionStatus, txIndex uint64, tx *types.Tx) error {