modify import path (#1805)

[bytom/bytom.git] / blockchain / txbuilder / constraint.go

diff --git a/blockchain/txbuilder/constraint.go b/blockchain/txbuilder/constraint.go
index e477e9b..d562872 100644 (file)
--- a/blockchain/txbuilder/constraint.go
+++ b/blockchain/txbuilder/constraint.go
@@ -1,10 +1,9 @@
 package txbuilder
 
 import (
-       "chain/crypto/sha3pool"
-       "chain/protocol/bc"
-       "chain/protocol/vm"
-       "chain/protocol/vm/vmutil"
+       "github.com/bytom/bytom/protocol/bc"
+       "github.com/bytom/bytom/protocol/vm"
+       "github.com/bytom/bytom/protocol/vm/vmutil"
 )
 
 // Constraint types express a constraint on an input of a proposed
@@ -17,34 +16,6 @@ type constraint interface {
        code() []byte
 }
 
-// timeConstraint means the tx is only valid within the given time
-// bounds.  Either value is allowed to be 0 meaning "ignore."
-type timeConstraint struct {
-       minTimeMS, maxTimeMS uint64
-}
-
-func (t timeConstraint) code() []byte {
-       if t.minTimeMS == 0 && t.maxTimeMS == 0 {
-               return []byte{byte(vm.OP_TRUE)}
-       }
-       builder := vmutil.NewBuilder()
-       if t.minTimeMS > 0 {
-               builder.AddOp(vm.OP_MINTIME).AddInt64(int64(t.minTimeMS)).AddOp(vm.OP_GREATERTHANOREQUAL)
-       }
-       if t.maxTimeMS > 0 {
-               if t.minTimeMS > 0 {
-                       // Consume the boolean left by the "mintime" clause, failing
-                       // immediately if it's false, so that the result of the
-                       // "maxtime" clause below is really (mintime clause && maxtime
-                       // clause).
-                       builder.AddOp(vm.OP_VERIFY)
-               }
-               builder.AddOp(vm.OP_MAXTIME).AddInt64(int64(t.maxTimeMS)).AddOp(vm.OP_LESSTHANOREQUAL)
-       }
-       prog, _ := builder.Build() // error is impossible
-       return prog
-}
-
 // outpointConstraint requires the outputID (and therefore, the outpoint) being spent to equal the
 // given value.
 type outputIDConstraint bc.Hash
@@ -58,46 +29,17 @@ func (o outputIDConstraint) code() []byte {
        return prog
 }
 
-// refdataConstraint requires the refdatahash of the transaction (if
-// tx is true) or the input (if tx is false) to match that of the
-// given data.
-type refdataConstraint struct {
-       data []byte
-       tx   bool
-}
-
-func (r refdataConstraint) code() []byte {
-       var h [32]byte
-       sha3pool.Sum256(h[:], r.data)
-       builder := vmutil.NewBuilder()
-       builder.AddData(h[:])
-       if r.tx {
-               builder.AddOp(vm.OP_TXDATA)
-       } else {
-               builder.AddOp(vm.OP_ENTRYDATA)
-       }
-       builder.AddOp(vm.OP_EQUAL)
-       prog, _ := builder.Build() // error is impossible
-       return prog
-}
-
 // PayConstraint requires the transaction to include a given output
 // at the given index, optionally with the given refdatahash.
 type payConstraint struct {
        Index int
        bc.AssetAmount
-       Program     []byte
-       RefDataHash *bc.Hash
+       Program []byte
 }
 
 func (p payConstraint) code() []byte {
        builder := vmutil.NewBuilder()
        builder.AddInt64(int64(p.Index))
-       if p.RefDataHash == nil {
-               builder.AddData([]byte{})
-       } else {
-               builder.AddData(p.RefDataHash.Bytes())
-       }
        builder.AddInt64(int64(p.Amount)).AddData(p.AssetId.Bytes()).AddInt64(1).AddData(p.Program)
        builder.AddOp(vm.OP_CHECKOUTPUT)
        prog, _ := builder.Build() // error is impossible