fix(): fix log

Author: zyjblockchain

client.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/inconshreveable/log15"
 	"io/ioutil"
 	"math/big"
 	"net/http"
@@ -13,12 +14,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/everFinance/sandy_log/log"
-
 	"github.com/everFinance/goar/types"
 	"github.com/everFinance/goar/utils"
 )
 
+var log = log15.New("module", "goar")
+
 // arweave HTTP API: https://docs.arweave.org/developers/server/http-api
 
 type Client struct {
@@ -33,7 +34,7 @@ func NewClient(nodeUrl string, proxyUrl ...string) *Client {
 		pUrl := proxyUrl[0]
 		proxyUrl, err := url.Parse(pUrl)
 		if err != nil {
-			log.Errorf("url parse error: %v", err)
+			log.Error("url parse", "error", err)
 			panic(err)
 		}
 		tr := &http.Transport{Proxy: http.ProxyURL(proxyUrl)}

client_broadcast.go

@@ -15,10 +15,9 @@ func (c *Client) GetTxDataFromPeers(txId string) ([]byte, error) {
 		pNode := NewClient("http://" + peer)
 		data, err := pNode.DownloadChunkData(txId)
 		if err != nil {
-			fmt.Printf("get tx data error:%v, peer: %s\n", err, peer)
+			log.Error("get tx data", "err", err, "peer", peer)
 			continue
 		}
-		fmt.Printf("success get tx data; peer: %s\n", peer)
 		return data, nil
 	}
 
@@ -33,7 +32,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)
 		if err != nil {

client_test.go

@@ -181,7 +181,7 @@ func TestClient_GetBlockByHeight(t *testing.T) {
 	cli := NewClient(arNode)
 	block, err := cli.GetBlockByHeight(793791)
 	assert.NoError(t, err)
-	assert.Equal(t, "7YeJpe53rFsEE03yKjGcBQAAw6efgVfSeGNLmPRGY4c", block.Nonce)
+	assert.Equal(t, "ci2uJhYmdldgkHbScDClCwAA0eqn7dCduAEpLfRorSA", block.Nonce)
 }
 
 func TestClient_GetTransactionDataByGateway(t *testing.T) {

go.mod

@@ -4,9 +4,11 @@ go 1.15
 
 require (
 	github.com/everFinance/gojwk v1.0.0
-	github.com/everFinance/sandy_log v1.0.3
 	github.com/everFinance/ttcrsa v1.1.3
+	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/hamba/avro v1.5.6
+	github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
+	github.com/mattn/go-colorable v0.1.11 // indirect
 	github.com/shopspring/decimal v1.2.0
 	github.com/stretchr/testify v1.7.0
 )

threshold.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/everFinance/sandy_log/log"
 	tcrsa "github.com/everFinance/ttcrsa"
 )
 
@@ -28,10 +27,10 @@ func CreateTcKeyPair(bitSize, k, l int) (shares tcrsa.KeyShareList, meta *tcrsa.
 	now := time.Now()
 	keyShares, keyMeta, err := tcrsa.NewKey(bitSize, uint16(k), uint16(l), nil)
 	if err != nil {
-		log.Errorf("tcrsa newKey error; bitSize: %d, k: %d, l: %d; err: %v", bitSize, k, l, err)
+		log.Error("tcrsa newKey", "err", err, "bitSize", bitSize, "k", k, "l", l)
 		return nil, nil, err
 	}
-	log.Debugf("Create bit size = %d rsa threshold keyPair spend time: %s", bitSize, time.Since(now).String())
+	log.Debug("Create rsa threshold keyPair success", "bitSize", bitSize, "spendTime", time.Since(now).String())
 	return keyShares, keyMeta, nil
 }
 
@@ -81,20 +80,20 @@ func (ts *TcSign) AssembleSigShares(signedShares tcrsa.SigShareList) ([]byte, er
 	// verify each signer share
 	for _, sd := range signedShares {
 		if err := sd.Verify(ts.pssData, ts.keyMeta); err != nil {
-			log.Errorf("verify signer %d sign failed; err: %v", sd.Id, err)
+			log.Error("verify signer sign failed", "err", err, "signer", sd.Id)
 			return nil, err
 		}
 	}
 	signature, err := signedShares.Join(ts.pssData, ts.keyMeta)
 	if err != nil {
-		log.Errorf("signedShares.Join(signDataByPss, meta) error: %v", err)
+		log.Error("signedShares.Join(signDataByPss, meta)", "err", err)
 		return nil, err
 	}
 
 	// verify
 	signHashed := sha256.Sum256(ts.signData)
 	if err := rsa.VerifyPSS(ts.keyMeta.PublicKey, crypto.SHA256, signHashed[:], signature, nil); err != nil {
-		log.Errorf("verify signature error; %v", err)
+		log.Error("verify signature", "err", err)
 		return nil, err
 	}
 	return signature, nil

uploader.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/everFinance/goar/types"
 	"github.com/everFinance/goar/utils"
-	"github.com/everFinance/sandy_log/log"
 	"github.com/shopspring/decimal"
 )
 
@@ -40,15 +39,15 @@ func newUploader(tt *types.Transaction, client *Client) (*TransactionUploader, e
 		return nil, errors.New("Transaction is not signed.")
 	}
 	if tt.Chunks == nil {
-		log.Warnf("Transaction chunks not perpared.")
+		log.Warn("Transaction chunks not perpared")
 	}
 	// Make a copy of Transaction, zeroing the Data so we can serialize.
 	tu := &TransactionUploader{
 		Client: client,
 	}
 	da, err := utils.Base64Decode(tt.Data)
 	if err != nil {
-		log.Errorf("da, err := utils.Base64Decode(tt.Data) error: %v", err)
+		log.Error("utils.Base64Decode(tt.Data)", "err", err)
 		return nil, err
 
 	}
@@ -92,7 +91,7 @@ func CreateUploader(api *Client, upload interface{}, data []byte) (*TransactionU
 		// upload 返回为 SerializedUploader 类型
 		upload, err = (&TransactionUploader{Client: api}).FromTransactionId(id)
 		if err != nil {
-			log.Errorf("(&TransactionUploader{Client: api}).FromTransactionId(id) error: %v", err)
+			log.Error("(&TransactionUploader{Client: api}).FromTransactionId(id)", "err", err)
 			return nil, err
 		}
 	} else {
@@ -158,7 +157,7 @@ func (tt *TransactionUploader) PctComplete() float64 {
 func (tt *TransactionUploader) UploadChunk() error {
 	defer func() {
 		if tt.TotalChunks() > 0 {
-			fmt.Printf("%f%% completes, %d/%d \n", tt.PctComplete(), tt.UploadedChunks(), tt.TotalChunks())
+			log.Debug("chunks", "uploads", fmt.Sprintf("%f%% completes, %d/%d", tt.PctComplete(), tt.UploadedChunks(), tt.TotalChunks()))
 		}
 	}()
 	if tt.IsComplete() {
@@ -218,8 +217,7 @@ func (tt *TransactionUploader) UploadChunk() error {
 	if err != nil {
 		return err
 	}
-	body, statusCode, err := tt.Client.SubmitChunks(gc)
-	fmt.Println("post tx chunk body: ", body)
+	_, statusCode, err := tt.Client.SubmitChunks(gc)
 	tt.LastRequestTimeEnd = time.Now().UnixNano() / 1000000
 	tt.LastResponseStatus = statusCode
 	if statusCode == 200 {
@@ -317,8 +315,7 @@ func (tt *TransactionUploader) uploadTx(withBody bool) error {
 		// Post the Transaction with Data.
 		tt.Transaction.Data = utils.Base64Encode(tt.Data)
 	}
-	body, statusCode, err := tt.Client.SubmitTransaction(tt.Transaction)
-	fmt.Printf("uplaodTx; body: %s, status: %d, txId: %s \n", body, statusCode, tt.Transaction.ID)
+	_, statusCode, err := tt.Client.SubmitTransaction(tt.Transaction)
 	if err != nil {
 		tt.LastResponseError = err.Error()
 		return errors.New(fmt.Sprintf("Unable to upload Transaction: %d, %v", statusCode, err))