fix(): add new feature: client.GetTxDataFromPeers and client.BroadcastData

Author: zyjblockchain

README.md

@@ -91,6 +91,8 @@ fmt.Println(id, err) // {{id}}, nil
 - [x] GetBlockByHeight
 - [x] BatchSendItemToBundler
 - [x] GetBundle
+- [x] GetTxDataFromPeers
+- [x] BroadcastData
 
 Initialize the instance:
 

client.go

@@ -75,7 +75,7 @@ func (c *Client) GetPeers() ([]string, error) {
 		fpeers = append(fpeers, p)
 	}
 
-	return peers[:], nil
+	return fpeers, nil
 }
 
 // GetTransactionByID status: Pending/Invalid hash/overspend
@@ -169,10 +169,13 @@ func (c *Client) GetTransactionData(id string, extension ...string) (body []byte
 	body, statusCode, err := c.httpGet(urlPath)
 
 	// When data is bigger than 12MiB statusCode == 400 NOTE: Data bigger than that has to be downloaded chunk by chunk.
-	if statusCode == 400 || len(body) == 0 {
+	if statusCode == 400 {
 		body, err = c.DownloadChunkData(id)
 		return
 	} else if statusCode == 200 {
+		if len(body) == 0 {
+			return c.DownloadChunkData(id)
+		}
 		return body, nil
 	} else if statusCode == 202 {
 		return nil, ErrPendingTx
@@ -189,6 +192,9 @@ func (c *Client) GetTransactionDataByGateway(id string) (body []byte, err error)
 	body, statusCode, err := c.httpGet(urlPath)
 	switch statusCode {
 	case 200:
+		if len(body) == 0 {
+			return c.DownloadChunkData(id)
+		}
 		return body, nil
 	case 400:
 		return c.DownloadChunkData(id)

client_broadcast.go

@@ -3,8 +3,6 @@ package goar
 import (
 	"errors"
 	"fmt"
-
-	"github.com/everFinance/sandy_log/log"
 )
 
 func (c *Client) GetTxDataFromPeers(txId string) ([]byte, error) {
@@ -15,11 +13,12 @@ func (c *Client) GetTxDataFromPeers(txId string) ([]byte, error) {
 
 	for _, peer := range peers {
 		pNode := NewClient("http://" + peer)
-		data, err := pNode.GetTransactionData(txId)
+		data, err := pNode.DownloadChunkData(txId)
 		if err != nil {
-			log.Error("get tx data failed", "error", err, "peer", peer)
+			fmt.Printf("get tx data error:%v, peer: %s\n", err, peer)
 			continue
 		}
+		fmt.Printf("success get tx data; peer: %s\n", peer)
 		return data, nil
 	}
 
@@ -34,7 +33,6 @@ func (c *Client) BroadcastData(txId string, data []byte, numOfNodes int64) error
 
 	count := int64(0)
 	for _, peer := range peers {
-
 		fmt.Printf("upload peer: %s, count: %d\n", peer, count)
 		arNode := NewClient("http://" + peer)
 		uploader, err := CreateUploader(arNode, txId, data)

client_test.go

@@ -201,28 +201,6 @@ func TestClient_GetPeers(t *testing.T) {
 	t.Log(len(peers))
 }
 
-// func Test_BroadcastData(t *testing.T) {
-// 	data := make([]byte, 1103732)
-// 	data[0] = byte('z')
-// 	data[1] = byte('y')
-// 	data[2] = byte('j')
-// 	for i := 3; i < len(data); i++ {
-// 		data[i] = byte('a')
-// 	}
-
-// 	cli := NewClient("https://arweave.net")
-// 	txId := "D3GOny9cItUEc8qAl1oLUtnoLOB3OfSB-wKbw8TUIRc"
-// 	err = cli.BroadcastData(txId, data, 1)
-// 	assert.NoError(t, err)
-// }
-
-// func Test_GetTxDataFromPeers(t *testing.T) {
-// 	cli := NewClient("https://arweave.net")
-// 	txId := "D3GOny9cItUEc8qAl1oLUtnoLOB3OfSB-wKbw8TUIRc"
-// 	data, err := cli.GetTxDataFromPeers(txId)
-// 	assert.NoError(t, err)
-// 	assert.Equal(t, 1471643, len(data))
-// }
 func Test_GetTxDataFromPeers(t *testing.T) {
 	cli := NewClient("https://arweave.net")
 	txId := "J5FY1Ovd6JJ49WFHfCf-1wDM1TbaPSdKnGIB_8ePErE"
@@ -241,12 +219,12 @@ func Test_GetTxDataFromPeers(t *testing.T) {
 	assert.Equal(t, tx.DataRoot, dataRoot)
 }
 
-func TestClient_UploadTxDataToPeers(t *testing.T) {
+func TestClient_BroadcastData(t *testing.T) {
 	cli := NewClient("https://arweave.net")
 	txId := "J5FY1Ovd6JJ49WFHfCf-1wDM1TbaPSdKnGIB_8ePErE"
 	data, err := cli.GetTransactionData(txId, "json")
 	assert.NoError(t, err)
 
-	err = cli.UploadTxDataToPeers(txId, data)
+	err = cli.BroadcastData(txId, data, 20)
 	assert.NoError(t, err)
 }

wallet_test.go

@@ -2,7 +2,6 @@ package goar
 
 import (
 	"encoding/base64"
-	"github.com/everFinance/goar/types"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -64,21 +63,21 @@ func TestWallet_SendAR(t *testing.T) {
 
 // test send small size file
 func TestWallet_SendDataSpeedUp01(t *testing.T) {
-	arNode := "https://arweave.net"
-	w, err := NewWalletFromPath("./example/testKey.json", arNode) // your wallet private key
-	assert.NoError(t, err)
-
-	// data := []byte("aaa this is a goar test small size file data") // small file
-	data := make([]byte, 255*1024)
-	for i := 0; i < len(data); i++ {
-		data[i] = byte('b' + i)
-	}
-	tags := []types.Tag{
-		{Name: "GOAR", Value: "SMDT"},
-	}
-	id, err := w.SendDataSpeedUp(data, tags, 50)
-	assert.NoError(t, err)
-	t.Logf("tx hash: %s", id)
+	// arNode := "https://arweave.net"
+	// w, err := NewWalletFromPath("./example/testKey.json", arNode) // your wallet private key
+	// assert.NoError(t, err)
+	//
+	// // data := []byte("aaa this is a goar test small size file data") // small file
+	// data := make([]byte, 255*1024)
+	// for i := 0; i < len(data); i++ {
+	// 	data[i] = byte('b' + i)
+	// }
+	// tags := []types.Tag{
+	// 	{Name: "GOAR", Value: "SMDT"},
+	// }
+	// id, err := w.SendDataSpeedUp(data, tags, 50)
+	// assert.NoError(t, err)
+	// t.Logf("tx hash: %s", id)
 }
 
 // test send big size file