Merge pull request #19 from everFinance/fix-bug

feat(): fix get block by height bug

Author: outprog

client.go

@@ -97,6 +97,23 @@ func (c *Client) GetTransactionField(id string, field string) (f string, err err
 	return
 }
 
+func (c *Client) GetTransactionTags(id string) ([]types.Tag, error) {
+	jsTags, err := c.GetTransactionField(id, "tags")
+	if err != nil {
+		return nil, err
+	}
+
+	tags := make([]types.Tag, 0)
+	if err := json.Unmarshal([]byte(jsTags), &tags); err != nil {
+		return nil, err
+	}
+	tags, err = utils.TagsDecode(tags)
+	if err != nil {
+		return nil, err
+	}
+	return tags, nil
+}
+
 func (c *Client) GetTransactionData(id string, extension ...string) (body []byte, err error) {
 	url := fmt.Sprintf("tx/%v/%v", id, "data")
 	if extension != nil {

client_test.go

@@ -112,22 +112,13 @@ func TestClient_DownloadChunkData(t *testing.T) {
 	// assert.NoError(t, err)
 }
 
-func TestClient_GetTransactionData(t *testing.T) {
-	// proxy := "http://127.0.0.1:8001"
-	client := NewClient("https://arweave.net")
-	id := "lSHWbAfjJsK0so08BTTmHO_n809fGW2DYOMySsXHNuI"
-	data, err := client.GetTransactionData(id, "json")
-	if err != nil {
-		t.Log(err.Error())
-	}
-
-	t.Log(string(data))
-}
-
-func TestNew(t *testing.T) {
-	data := []byte("this is a goar test small size file data")
-	a := utils.Base64Encode(data)
-	t.Log(a)
+func TestClient_Arql(t *testing.T) {
+	// client := NewClient("https://arweave.dev")
+	// id := "PvLGaQzn9MOwucO91uuMGRnq8pj1qlwbURPqhmW0UiM"
+	//
+	// status, err := client.GetTransactionStatus(id)
+	// assert.NoError(t, err)
+	// t.Log(status)
 }
 
 func TestClient_VerifyTx(t *testing.T) {
@@ -173,3 +164,22 @@ func TestGetTransaction(t *testing.T) {
 	// assert.Equal(t, "Pending",err.Error())
 	// assert.Nil(t, txStatus)
 }
+
+func TestClient_GetTransactionTags(t *testing.T) {
+	arNode := "https://arweave.net"
+	cli := NewClient(arNode)
+	id := "gdXUJuj9EZm99TmeES7zRHCJtnJoP3XgYo_7KJNV8Vw"
+	tags, err := cli.GetTransactionTags(id)
+	assert.NoError(t, err)
+	assert.Equal(t, "App", tags[0].Name)
+	assert.Equal(t, "Version", tags[1].Name)
+	assert.Equal(t, "Owner", tags[2].Name)
+}
+
+func TestClient_GetBlockByHeight(t *testing.T) {
+	arNode := "https://arweave.net"
+	cli := NewClient(arNode)
+	block, err := cli.GetBlockByHeight(737432)
+	assert.NoError(t, err)
+	assert.Equal(t, "7YeJpe53rFsEE03yKjGcBQAAw6efgVfSeGNLmPRGY4c", block.Nonce)
+}

types/types.go

@@ -25,9 +25,9 @@ type Block struct {
 	WalletList    string        `json:"wallet_list"`
 	RewardAddr    string        `json:"reward_addr"`
 	Tags          []interface{} `json:"tags"`
-	RewardPool    int           `json:"reward_pool"`
-	WeaveSize     int           `json:"weave_size"`
-	BlockSize     int           `json:"block_size"`
+	RewardPool    string        `json:"reward_pool"`
+	WeaveSize     string        `json:"weave_size"`
+	BlockSize     string        `json:"block_size"`
 }
 
 type TransactionChunk struct {