remove the timerange check

[bytom/bytom.git] / protocol / validation / validation.go

diff --git a/protocol/validation/validation.go b/protocol/validation/validation.go
index 36b51bf..9b22404 100644 (file)
--- a/protocol/validation/validation.go
+++ b/protocol/validation/validation.go
@@ -195,25 +195,12 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                }
 
        case *bc.Nonce:
+               //TODO: add block heigh range check on the control program
                gasLeft, err := vm.Verify(NewTxVMContext(vs.tx, e, e.Program, e.WitnessArguments), int64(vs.gas.gasLeft))
                vs.gas.updateUsage(gasLeft)
                if err != nil {
                        return errors.Wrap(err, "checking nonce program")
                }
-               tr, err := vs.tx.TimeRange(*e.TimeRangeId)
-               if err != nil {
-                       return errors.Wrap(err, "getting nonce timerange")
-               }
-               vs2 := *vs
-               vs2.entryID = *e.TimeRangeId
-               err = checkValid(&vs2, tr)
-               if err != nil {
-                       return errors.Wrap(err, "checking nonce timerange")
-               }
-
-               if tr.MinTimeMs == 0 || tr.MaxTimeMs == 0 {
-                       return errZeroTime
-               }
 
                if vs.tx.Version == 1 && e.ExtHash != nil && !e.ExtHash.IsZero() {
                        return errNonemptyExtHash
@@ -243,17 +230,6 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        return errNonemptyExtHash
                }
 
-       case *bc.TimeRange:
-               if e.MinTimeMs > vs.tx.MinTimeMs {
-                       return errBadTimeRange
-               }
-               if e.MaxTimeMs > 0 && e.MaxTimeMs < vs.tx.MaxTimeMs {
-                       return errBadTimeRange
-               }
-               if vs.tx.Version == 1 && e.ExtHash != nil && !e.ExtHash.IsZero() {
-                       return errNonemptyExtHash
-               }
-
        case *bc.Issuance:
                computedAssetID := e.WitnessAssetDefinition.ComputeAssetID()
                if computedAssetID != *e.Value.AssetId {