Merge pull request #18 from everFinance/refactor

feat(): refactor get transaction api

Author: outprog

client.go

@@ -51,16 +51,15 @@ func (c *Client) GetInfo() (info *types.NetworkInfo, err error) {
 	return
 }
 
-// status: Pending/Invalid hash/overspend
-func (c *Client) GetTransactionByID(id string) (tx *types.Transaction, status string, code int, err error) {
+// GetTransactionByID status: Pending/Invalid hash/overspend
+func (c *Client) GetTransactionByID(id string) (tx *types.Transaction, err error) {
 	body, statusCode, err := c.httpGet(fmt.Sprintf("tx/%s", id))
 	if err != nil {
 		return
 	}
 
-	code = statusCode
 	if statusCode != 200 {
-		status = string(body)
+		err = errors.New(string(body))
 		return
 	}
 
@@ -71,15 +70,19 @@ func (c *Client) GetTransactionByID(id string) (tx *types.Transaction, status st
 }
 
 // GetTransactionStatus
-func (c *Client) GetTransactionStatus(id string) (status string, code int, err error) {
+func (c *Client) GetTransactionStatus(id string) (*types.TxStatus, error) {
 	body, code, err := c.httpGet(fmt.Sprintf("tx/%s/status", id))
-	if code == 200 {
-		return types.SuccessTxStatus, code, nil
-	} else if code == 202 {
-		return types.PendingTxStatus, code, nil
-	} else {
-		return string(body), code, err
+	if err != nil {
+		return nil, err
 	}
+	if code != 200 {
+		return nil, errors.New(string(body))
+	}
+
+	// json unmarshal
+	txStatus := &types.TxStatus{}
+	err = json.Unmarshal(body, txStatus)
+	return txStatus, err
 }
 
 func (c *Client) GetTransactionField(id string, field string) (f string, err error) {

client_test.go

@@ -134,11 +134,42 @@ func TestClient_VerifyTx(t *testing.T) {
 	// txId := "XOzxw5kaYJrt9Vljj23pA5_6b63kY2ydQ0lPfnhksMA"
 	txId := "_fVj-WyEtXV3URXlNkSnHVGupl7_DM1UWZ64WMdhPkU"
 	client := NewClient("https://arweave.net")
-	tx, status, code, err := client.GetTransactionByID(txId)
+	tx, err := client.GetTransactionByID(txId)
 	assert.NoError(t, err)
-	t.Log(status, code)
 	t.Log(tx.Format)
 	t.Log(utils.TagsDecode(tx.Tags))
 	err = utils.VerifyTransaction(*tx)
 	assert.NoError(t, err)
 }
+
+func TestGetTransaction(t *testing.T) {
+	arNode := "https://arweave.net"
+	cli := NewClient(arNode)
+
+	// on chain tx
+	txId := "ggt-x5Q_niHifdNzMxZrhiibKf0KQ-cJun0UIBBa-yA"
+	txStatus, err := cli.GetTransactionStatus(txId)
+	assert.NoError(t, err)
+	assert.Equal(t, 575660, txStatus.BlockHeight)
+	tx, err := cli.GetTransactionByID(txId)
+	assert.NoError(t, err)
+	assert.Equal(t, "0pu7-Otb-AH6SSSX_rfUmpTkwh3Nmhpztd_IT8nYXDwBE6P3B-eJSBuaTBeLypx4", tx.LastTx)
+
+	// not exist tx
+	txId = "KPlEyCrcs2rDHBFn2f0UUn2NZQKfawGb_EnBfip8ayA"
+	txStatus, err = cli.GetTransactionStatus(txId)
+	assert.Equal(t, `{"status":404,"error":"Not Found"}`, err.Error())
+	assert.Nil(t, txStatus)
+	tx, err = cli.GetTransactionByID(txId)
+	assert.Equal(t, `{"status":404,"error":"Not Found"}`, err.Error())
+	assert.Nil(t, tx)
+
+	// // pending tx
+	// txId = "muANv_lsyZKC5C8fTxQaC2dCCyGDao8z35ECuGdIBP8" // need send a new tx create pending status
+	// txStatus, err = cli.GetTransactionStatus(txId)
+	// assert.Equal(t, "Pending",err.Error())
+	// assert.Nil(t, txStatus)
+	// tx, err = cli.GetTransactionByID(txId)
+	// assert.Equal(t, "Pending",err.Error())
+	// assert.Nil(t, txStatus)
+}

example/api_example_test.go

@@ -19,9 +19,8 @@ func Test_Client(t *testing.T) {
 	t.Logf("%v", nodeInfo)
 
 	// 2. full transaction via Id
-	tx, state, _, err := c.GetTransactionByID(txId)
+	tx, err := c.GetTransactionByID(txId)
 	assert.NoError(t, err)
-	t.Logf("state: %s", state)
 	t.Log(tx)
 
 	// 3. get transaction field by id
@@ -53,17 +52,6 @@ func Test_Client(t *testing.T) {
 
 }
 
-func TestGetTransactionsStatus(t *testing.T) {
-	arNode := "https://arweave.net"
-	wallet, err := goar.NewWalletFromPath("./testKey.json", arNode)
-	assert.NoError(t, err)
-
-	status, code, err := wallet.Client.GetTransactionStatus("ggt-x5Q_niHifdNzMxZrhiibKf0KQ-cJun0UIBBa-yA")
-	assert.Equal(t, "Success", status)
-	assert.Equal(t, 200, code)
-	assert.NoError(t, err)
-}
-
 func Test_Arq(t *testing.T) {
 	arqStr := `{
 			"op": "and",

example/chunks_tx_test.go

@@ -109,14 +109,13 @@ func Test_RetryUploadDataByTxId(t *testing.T) {
 
 	// 2. watcher this tx from ar chain and must be sure the tx on chain
 	getTxOnchain := func() bool {
-		_, body, statusCode, _ := wallet.Client.GetTransactionByID(tx.ID)
-		if statusCode/100 == 2 && string(body) == "Pending" {
+		_, err := wallet.Client.GetTransactionByID(tx.ID)
+		if err != nil {
 			t.Log("watcher tx status: ", string(body))
 			return false
-		} else if statusCode/100 == 2 {
+		} else {
 			return true
 		}
-		return false
 	}
 
 	// watcher tx

types/types.go

@@ -40,3 +40,9 @@ type TransactionOffset struct {
 	Size   string `json:"size"`
 	Offset string `json:"offset"`
 }
+
+type TxStatus struct {
+	BlockHeight           int    `json:"block_height"`
+	BlockIndepHash        string `json:"block_indep_hash"`
+	NumberOfConfirmations int    `json:"number_of_confirmations"`
+}

uploader.go

@@ -262,9 +262,9 @@ func (tt *TransactionUploader) FromSerialized(serialized *SerializedUploader, da
  * @param data
  */
 func (tt *TransactionUploader) FromTransactionId(id string) (*SerializedUploader, error) {
-	tx, state, code, err := tt.Client.GetTransactionByID(id)
-	if err != nil || state == "Pending" || code/100 != 2 {
-		return nil, errors.New(fmt.Sprintf("Tx %s not found: %d, error: %v", id, code, err))
+	tx, err := tt.Client.GetTransactionByID(id)
+	if err != nil {
+		return nil, errors.New(fmt.Sprintf("Tx %s not found; error: %v", id, err))
 	}
 	transaction := tx
 	transaction.Data = ""