X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Fvalidation%2Fblock.go;fp=protocol%2Fvalidation%2Fblock.go;h=429201410fff2f32d40db0199f5978133629651d;hb=37774d27fc6ec5f3d80d9d7de7245d4f5037039d;hp=9be89a07fd200ae2805fb2d8d2778ced368e8afb;hpb=b9f85eadf85f8cad476144e7ccb50e62b569b394;p=bytom%2Fvapor.git

diff --git a/protocol/validation/block.go b/protocol/validation/block.go
index 9be89a07..42920141 100644
--- a/protocol/validation/block.go
+++ b/protocol/validation/block.go
@@ -101,13 +101,6 @@ func ValidateBlock(b *bc.Block, parent *types.BlockHeader, rewards []state.Coinb
 			return errors.Wrapf(validateResult.err, "validate of transaction %d of %d", i, len(b.Transactions))
 		}
 
-		// for support flash swap running on vapor, status fail txs need to be
-		// rejected. Or the attacker can steal BTM from any BTM/* trade pair by
-		// using status fail charge fee rule.
-		if b.Height >= consensus.ActiveNetParams.MovStartHeight && validateResult.err != nil {
-			return errors.New("the chain currently didn't support status fail tx")
-		}
-
 		if err := b.TransactionStatus.SetStatus(i, validateResult.err != nil); err != nil {
 			return err
 		}