From 4829882cdd551adb9bc2c7c446728b772350799f Mon Sep 17 00:00:00 2001
From: muXxer <mux3r@web.de>
Date: Mon, 9 Sep 2019 11:01:41 +0200
Subject: [PATCH] Added TransactionToTrits (#124)

---
 .../.examples/transaction_examples_test.go    |  5 +++
 transaction/transaction.go                    | 31 ++++++++++++-------
 transaction/transaction_test.go               | 15 +++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/transaction/.examples/transaction_examples_test.go b/transaction/.examples/transaction_examples_test.go
index 5835100a4..685ea8907 100644
--- a/transaction/.examples/transaction_examples_test.go
+++ b/transaction/.examples/transaction_examples_test.go
@@ -71,6 +71,11 @@ func ExampleAsTransactionObject() {}
 // o: error, Returned for schematically wrong transactions.
 func ExampleAsTransactionObjects() {}
 
+// i req: t, The transaction to convert to Trits.
+// o: Trits, The Trits representation of the transaction.
+// o: error, Returned for schematically wrong transactions.
+func ExampleTransactionToTrits() {}
+
 // i req: t, The transaction to convert to Trytes.
 // o: Trytes, The Trytes representation of the transaction.
 // o: error, Returned for schematically wrong transactions.
diff --git a/transaction/transaction.go b/transaction/transaction.go
index 7fbcc9482..7ed60b84d 100644
--- a/transaction/transaction.go
+++ b/transaction/transaction.go
@@ -137,59 +137,68 @@ func AsTransactionObjects(rawTrytes []Trytes, hashes Hashes) (Transactions, erro
 	return txs, nil
 }
 
-// TransactionToTrytes converts the transaction to trytes.
-func TransactionToTrytes(t *Transaction) (Trytes, error) {
+// TransactionToTrits converts the transaction to trits.
+func TransactionToTrits(t *Transaction) (Trits, error) {
 	tr := make(Trits, TransactionTrinarySize)
 	if !guards.IsTrytesOfExactLength(t.SignatureMessageFragment, SignatureMessageFragmentTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid signature message fragment")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid signature message fragment")
 	}
 	copy(tr, MustTrytesToTrits(t.SignatureMessageFragment))
 
 	if !guards.IsTrytesOfExactLength(t.Address, AddressTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid address")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid address")
 	}
 	copy(tr[AddressTrinaryOffset:], MustTrytesToTrits(t.Address))
 
 	copy(tr[ValueOffsetTrinary:], IntToTrits(t.Value))
 	if !guards.IsTrytesOfExactLength(t.ObsoleteTag, ObsoleteTagTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid obsolete tag")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid obsolete tag")
 	}
 	copy(tr[ObsoleteTagTrinaryOffset:], MustTrytesToTrits(t.ObsoleteTag))
 
 	copy(tr[TimestampTrinaryOffset:], IntToTrits(int64(t.Timestamp)))
 	if t.CurrentIndex > t.LastIndex {
-		return "", errors.Wrap(ErrInvalidIndex, "current index is bigger than last index")
+		return nil, errors.Wrap(ErrInvalidIndex, "current index is bigger than last index")
 	}
 
 	copy(tr[CurrentIndexTrinaryOffset:], IntToTrits(int64(t.CurrentIndex)))
 	copy(tr[LastIndexTrinaryOffset:], IntToTrits(int64(t.LastIndex)))
 	if !guards.IsTrytesOfExactLength(t.Bundle, BundleTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid bundle hash")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid bundle hash")
 	}
 	copy(tr[BundleTrinaryOffset:], MustTrytesToTrits(t.Bundle))
 
 	if !guards.IsTrytesOfExactLength(t.TrunkTransaction, TrunkTransactionTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid trunk tx hash")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid trunk tx hash")
 	}
 	copy(tr[TrunkTransactionTrinaryOffset:], MustTrytesToTrits(t.TrunkTransaction))
 
 	if !guards.IsTrytesOfExactLength(t.BranchTransaction, BranchTransactionTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid branch tx hash")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid branch tx hash")
 	}
 	copy(tr[BranchTransactionTrinaryOffset:], MustTrytesToTrits(t.BranchTransaction))
 
 	if !guards.IsTrytesOfExactLength(t.Tag, TagTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid tag")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid tag")
 	}
 	copy(tr[TagTrinaryOffset:], MustTrytesToTrits(t.Tag))
 	copy(tr[AttachmentTimestampTrinaryOffset:], IntToTrits(t.AttachmentTimestamp))
 	copy(tr[AttachmentTimestampLowerBoundTrinaryOffset:], IntToTrits(t.AttachmentTimestampLowerBound))
 	copy(tr[AttachmentTimestampUpperBoundTrinaryOffset:], IntToTrits(t.AttachmentTimestampUpperBound))
 	if !guards.IsTrytesOfExactLength(t.Nonce, NonceTrinarySize/3) {
-		return "", errors.Wrap(ErrInvalidTrytes, "invalid nonce")
+		return nil, errors.Wrap(ErrInvalidTrytes, "invalid nonce")
 	}
 	copy(tr[NonceTrinaryOffset:], MustTrytesToTrits(t.Nonce))
 
+	return tr, nil
+}
+
+// TransactionToTrytes converts the transaction to trytes.
+func TransactionToTrytes(t *Transaction) (Trytes, error) {
+	tr, err := TransactionToTrits(t)
+	if err != nil {
+		return "", err
+	}
 	return MustTritsToTrytes(tr), nil
 }
 
diff --git a/transaction/transaction_test.go b/transaction/transaction_test.go
index 93cfe9d40..43575d2cc 100644
--- a/transaction/transaction_test.go
+++ b/transaction/transaction_test.go
@@ -112,6 +112,21 @@ var _ = Describe("Transaction", func() {
 		})
 	})
 
+	Context("TransactionToTrits()", func() {
+
+		It("should return trits for a valid transaction", func() {
+			trits, err := TransactionToTrits(tx)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(trits).To(Equal(txTrits))
+		})
+
+		It("should return an error for invalid transaction", func() {
+			_, err := TransactionToTrits(&faultyTx)
+			Expect(err).To(HaveOccurred())
+		})
+
+	})
+
 	Context("TransactionToTrytes()", func() {
 
 		It("should return trytes for a valid transaction", func() {