diff --git a/packages/binary/valuetransfer/transaction/transaction.go b/packages/binary/valuetransfer/transaction/transaction.go index f95f61dfdf2ff342d4dd72ae8f5dbc08dea09f5a..8e9ff890a9a619c39e7966948ea1dba29167deee 100644 --- a/packages/binary/valuetransfer/transaction/transaction.go +++ b/packages/binary/valuetransfer/transaction/transaction.go @@ -32,7 +32,6 @@ type Transaction struct { signatureBytes []byte signatureBytesMutex sync.RWMutex - dataPayloadType uint32 dataPayload []byte dataPayloadMutex sync.RWMutex @@ -186,9 +185,6 @@ func (transaction *Transaction) EssenceBytes() []byte { // marshal outputs marshalUtil.WriteBytes(transaction.outputs.Bytes()) - // marshal dataPayload type - marshalUtil.WriteUint32(transaction.dataPayloadType) - // marshal dataPayload size marshalUtil.WriteUint32(transaction.DataPayloadSize()) @@ -273,7 +269,6 @@ func (transaction *Transaction) String() string { stringify.StructField("inputs", transaction.inputs), stringify.StructField("outputs", transaction.outputs), stringify.StructField("signatures", transaction.signatures), - stringify.StructField("dataPayloadType", transaction.dataPayloadType), stringify.StructField("dataPayloadSize", transaction.DataPayloadSize()), ) } @@ -282,7 +277,7 @@ func (transaction *Transaction) String() string { const MAX_DATA_PAYLOAD_SIZE = 64 * 1024 // sets yhe dataPayload and its type -func (transaction *Transaction) SetDataPayload(data []byte, payloadType uint32) error { +func (transaction *Transaction) SetDataPayload(data []byte) error { transaction.dataPayloadMutex.Lock() defer transaction.dataPayloadMutex.Unlock() @@ -290,16 +285,15 @@ func (transaction *Transaction) SetDataPayload(data []byte, payloadType uint32) return fmt.Errorf("maximum dataPayload size of %d bytes exceeded", MAX_DATA_PAYLOAD_SIZE) } transaction.dataPayload = data - transaction.dataPayloadType = payloadType return nil } // gets the dataPayload and its type -func (transaction *Transaction) GetDataPayload() ([]byte, uint32) { +func (transaction *Transaction) GetDataPayload() []byte { transaction.dataPayloadMutex.RLock() defer transaction.dataPayloadMutex.RUnlock() - return transaction.dataPayload, transaction.dataPayloadType + return transaction.dataPayload } // return size of the dataPayload as uint32 @@ -349,12 +343,6 @@ func (transaction *Transaction) UnmarshalObjectStorageValue(bytes []byte) (err e } transaction.outputs = parsedOutputs.(*Outputs) - // unmarshal data payload type - transaction.dataPayloadType, err = marshalUtil.ReadUint32() - if err != nil { - return - } - // unmarshal data payload size var dataPayloadSize uint32 dataPayloadSize, err = marshalUtil.ReadUint32() diff --git a/packages/binary/valuetransfer/transaction/transaction_test.go b/packages/binary/valuetransfer/transaction/transaction_test.go index e31d1c0d95a166d6d53e0994247b7e300bfbb332..7235fffd12742b47607b24350c0cca303fb4e3db 100644 --- a/packages/binary/valuetransfer/transaction/transaction_test.go +++ b/packages/binary/valuetransfer/transaction/transaction_test.go @@ -10,8 +10,6 @@ import ( "github.com/iotaledger/goshimmer/packages/binary/valuetransfer/balance" "github.com/iotaledger/hive.go/crypto/ed25519" "github.com/stretchr/testify/assert" - "strings" - "testing" ) func TestEmptyDataPayload(t *testing.T) { @@ -38,13 +36,11 @@ func TestShortDataPayload(t *testing.T) { tx := New(inputs, outputs) dataPayload := []byte("data payload test") - dataPayloadType := uint32(42) - err := tx.SetDataPayload(dataPayload, dataPayloadType) + err := tx.SetDataPayload(dataPayload) assert.Equal(t, nil, err) - dpBack, dptBack := tx.GetDataPayload() + dpBack := tx.GetDataPayload() assert.Equal(t, true, bytes.Equal(dpBack, dataPayload)) - assert.Equal(t, true, dptBack == dataPayloadType) tx.Sign(sigScheme) check := tx.SignaturesValid() @@ -54,7 +50,7 @@ func TestShortDataPayload(t *testing.T) { // reset essence to force recalculation tx.essenceBytes = nil dataPayload[2] = '?' - err = tx.SetDataPayload(dataPayload, dataPayloadType) + err = tx.SetDataPayload(dataPayload) assert.Equal(t, nil, err) // expect signature is not valid @@ -72,8 +68,7 @@ func TestTooLongDataPayload(t *testing.T) { tx := New(inputs, outputs) dataPayload := []byte(strings.Repeat("1", MAX_DATA_PAYLOAD_SIZE+1)) - dataPayloadType := uint32(42) - err := tx.SetDataPayload(dataPayload, dataPayloadType) + err := tx.SetDataPayload(dataPayload) assert.Equal(t, true, err != nil) } @@ -111,8 +106,7 @@ func TestMarshalingDataPayload(t *testing.T) { tx := New(inputs, outputs) dataPayload := []byte("data payload test") - dataPayloadType := uint32(42) - err := tx.SetDataPayload(dataPayload, dataPayloadType) + err := tx.SetDataPayload(dataPayload) assert.Equal(t, nil, err) tx.Sign(sigScheme)