add tostring and test

Author: rohenaz

README.md

@@ -39,9 +39,6 @@ type Tx struct {
 // BOB from libsv.transaction
 bobData := bob.New()
 err = bobData.FromTx(tx)
-if err != nil {
-  return err
-}
 
 ```
 
@@ -51,9 +48,6 @@ if err != nil {
 // BOB from libsv.transaction
 bobData := bob.New()
 tx, err = bobData.ToTx()
-if err != nil {
-  return err
-}
 
 ```
 
@@ -62,7 +56,7 @@ if err != nil {
 ```go
 // BOB formatted JSON string
 bobData := bob.New()
-tx = bobData.ToString()
+tx, err = bobData.ToString()
 
 ```
 
@@ -72,12 +66,14 @@ tx = bobData.ToString()
 // BOB to raw tx string
 bobData := bob.New()
 tx, err = bobData.ToRawTxString()
-if err != nil {
-  return err
-}
 
 ```
 
-## ToDo
+## BOB from raw tx string
 
-- FromRawTx
+```go
+// BOB from raw tx string
+bobTx := New()
+err := bobTx.FromRawTxString(rawTxString)
+
+```

bob.go

@@ -94,6 +94,16 @@ func (t *BobTx) FromString(line string) error {
 	return nil
 }
 
+// FromRawTxString takes a hex encoded tx string
+func (t *BobTx) FromRawTxString(rawTxString string) error {
+
+	tx, err := transaction.NewFromString(rawTxString)
+	if err != nil {
+		return err
+	}
+	return t.FromTx(tx)
+}
+
 // FromTx takes a libsv.Transaction
 func (t *BobTx) FromTx(tx *transaction.Transaction) error {
 
@@ -183,6 +193,16 @@ func (t *BobTx) FromTx(tx *transaction.Transaction) error {
 	return nil
 }
 
+// ToString returns a json string of bobTx
+func (t *BobTx) ToString() (string, error) {
+	// Create JSON from the instance data.
+	// ... Ignore errors.
+	b, err := json.Marshal(t)
+	// Convert bytes to string.
+	return string(b), err
+
+}
+
 // ToTx returns a transaction.Transaction
 func (t *BobTx) ToTx() (*transaction.Transaction, error) {
 	tx := transaction.New()
@@ -278,11 +298,7 @@ func (t *BobTx) FromBytes(line []byte) error {
 			for cellIdx, cell := range tape.Cell {
 				if len(cell.H) == 0 && len(cell.B) > 0 {
 					// base 64 decode cell.B and encode it to hex string
-					cellBytes, e := base64.StdEncoding.DecodeString(cell.B)
-					if e != nil {
-						fmt.Println(e)
-					}
-					log.Println("Replacing!", hex.EncodeToString(cellBytes))
+					cellBytes, _ := base64.StdEncoding.DecodeString(cell.B)
 					t.Out[outIdx].Tape[tapeIdx].Cell[cellIdx].H = hex.EncodeToString(cellBytes)
 				}
 			}
@@ -293,11 +309,7 @@ func (t *BobTx) FromBytes(line []byte) error {
 			for cellIdx, cell := range tape.Cell {
 				if len(cell.H) == 0 && len(cell.B) > 0 {
 					// base 64 decode cell.B and encode it to hex string
-					cellBytes, e := base64.StdEncoding.DecodeString(cell.B)
-					if e != nil {
-						fmt.Println(e)
-					}
-					log.Println("Replacing!", hex.EncodeToString(cellBytes))
+					cellBytes, _ := base64.StdEncoding.DecodeString(cell.B)
 					t.In[inIdx].Tape[tapeIdx].Cell[cellIdx].H = hex.EncodeToString(cellBytes)
 				}
 			}

bob_test.go

@@ -204,6 +204,45 @@ func TestToRawTxString(t *testing.T) {
 	}
 }
 
+func TestToString(t *testing.T) {
+	rawTxString := "0100000001f15a9d3c550c14e12ca066ad09edff31432f1e9f45894ecff5b70c8354c81f3d010000006b483045022100f012c3bd3781091aa8e53cab2ffcb90acced8c65500b41086fd225e48c98c1d702200b8ff117b8ecd2b2d7e95551bc5a1b3bbcca8049864479a28bed9dc842a86804412103ef5bb22964d529c0af748d9a6381432f05298e7a66ed2fe22e7975b1502528a7ffffffff0200000000000000001f006a15e4b880e781afe883bde999a4e58d83e5b9b4e69a970635386135393733b30100000000001976a9149c63715c6d1fa6c61b31d2911516e1c3db3bdfa888ac00000000"
+
+	bobTx := New()
+	err := bobTx.FromRawTxString(rawTxString)
+	if err != nil {
+		t.Errorf("Error %s", err)
+	}
+
+	// to string
+	txString, err := bobTx.ToString()
+	if err != nil {
+		t.Errorf("Error %s", err)
+	}
+
+	// from string
+	otherBob := New()
+	err = otherBob.FromString(txString)
+	if err != nil {
+		t.Errorf("Error %s", err)
+	}
+
+	// check txid match
+	if bobTx.Tx.H != otherBob.Tx.H {
+		t.Errorf("TXIDS do not match!")
+	}
+}
+
+func TestFromRawTx(t *testing.T) {
+
+	rawTxString := "0100000001f15a9d3c550c14e12ca066ad09edff31432f1e9f45894ecff5b70c8354c81f3d010000006b483045022100f012c3bd3781091aa8e53cab2ffcb90acced8c65500b41086fd225e48c98c1d702200b8ff117b8ecd2b2d7e95551bc5a1b3bbcca8049864479a28bed9dc842a86804412103ef5bb22964d529c0af748d9a6381432f05298e7a66ed2fe22e7975b1502528a7ffffffff0200000000000000001f006a15e4b880e781afe883bde999a4e58d83e5b9b4e69a970635386135393733b30100000000001976a9149c63715c6d1fa6c61b31d2911516e1c3db3bdfa888ac00000000"
+
+	bobTx := New()
+	err := bobTx.FromRawTxString(rawTxString)
+	if err != nil {
+		t.Errorf("Error %s", err)
+	}
+}
+
 func TestFromBadString(t *testing.T) {
 	bobBadStrings := New()
 	err := bobBadStrings.FromString(sampleBobTxBadStrings)