Merge pull request #201 from Bytom/v0.1

[bytom/vapor.git] / blockchain / txbuilder / builder.go

diff --git a/blockchain/txbuilder/builder.go b/blockchain/txbuilder/builder.go
index a9f5e06..52a8b39 100644 (file)
--- a/blockchain/txbuilder/builder.go
+++ b/blockchain/txbuilder/builder.go
@@ -24,7 +24,6 @@ type TemplateBuilder struct {
        timeRange           uint64
        rollbacks           []func()
        callbacks           []func() error
-       referenceData       []byte
 }
 
 // AddInput add inputs of transactions
@@ -39,17 +38,13 @@ func (b *TemplateBuilder) AddInput(in *types.TxInput, sigInstruction *SigningIns
 
 // AddOutput add outputs of transactions
 func (b *TemplateBuilder) AddOutput(o *types.TxOutput) error {
-       if o.Amount > math.MaxInt64 {
-               return errors.WithDetailf(ErrBadAmount, "amount %d exceeds maximum value 2^63", o.Amount)
+       if o.AssetAmount().Amount > math.MaxInt64 {
+               return errors.WithDetailf(ErrBadAmount, "amount %d exceeds maximum value 2^63", o.AssetAmount().Amount)
        }
        b.outputs = append(b.outputs, o)
        return nil
 }
 
-func (b *TemplateBuilder) SetReferenceData(referenceData []byte) {
-       b.referenceData = referenceData
-}
-
 // InputCount return number of input in the template builder
 func (b *TemplateBuilder) InputCount() int {
        return len(b.inputs)
@@ -136,8 +131,6 @@ func (b *TemplateBuilder) Build() (*Template, *types.TxData, error) {
                tx.Inputs = append(tx.Inputs, in)
        }
 
-       tx.ReferenceData = b.referenceData
-
        tpl.Transaction = types.NewTx(*tx)
        tpl.Fee = CalculateTxFee(tpl.Transaction)
        return tpl, tx, nil