upgrade uploader

Author: outprog

README.md

@@ -240,11 +240,10 @@ uploader, err := goar.CreateUploader(w.Client, tx, nil)
 if err != nil {
   return
 }
-for !uploader.IsComplete() {
-  err = uploader.UploadChunk()
-  if err != nil {
-    return
-  }
+
+err = uploader.Once()
+if err != nil {
+  return
 }
 ```
 
@@ -280,10 +279,7 @@ txId := "myTxId"
 // get uploader by txId and post big data by chunks
 uploader, err := goar.CreateUploader(wallet.Client, txId, bigData)
 assert.NoError(t, err)
-for !uploader.IsComplete() {
-  err := uploader.UploadChunk()
-  assert.NoError(t, err)
-}
+assert.NoError(t, uploader.Once())
 ```
 
 ##### NOTE: About all chunk transfer full example can be viewed in path `./example/chunks_tx_test.go`

client_broadcast.go

@@ -42,18 +42,11 @@ func (c *Client) BroadcastData(txId string, data []byte, numOfNodes int64) error
 			continue
 		}
 
-	Loop:
-		for !uploader.IsComplete() {
-			if err := uploader.UploadChunk(); err != nil {
-				break Loop
-			}
-			if uploader.LastResponseStatus != 200 {
-				break Loop
-			}
-		}
-		if uploader.IsComplete() { // upload success
-			count++
+		if err = uploader.Once(); err != nil {
+			continue
 		}
+
+		count++
 		if count >= numOfNodes {
 			return nil
 		}

example/chunks_tx_test.go

@@ -83,10 +83,7 @@ func Test_PostBigDataByChunks(t *testing.T) {
 	// uploader Transaction
 	uploader, err := goar.CreateUploader(wallet.Client, tx, nil)
 	assert.NoError(t, err)
-	for !uploader.IsComplete() {
-		err := uploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, uploader.Once())
 }
 
 // test retry upload(断点重传) post big size data by tx id
@@ -127,10 +124,7 @@ func Test_RetryUploadDataByTxId(t *testing.T) {
 	// get uploader by txId and post big data by chunks
 	uploader, err := goar.CreateUploader(wallet.Client, tx.ID, bigData)
 	assert.NoError(t, err)
-	for !uploader.IsComplete() {
-		err := uploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, uploader.Once())
 }
 
 // test continue upload(断点续传) big size data by last time uploader
@@ -171,10 +165,7 @@ func Test_ContinueUploadDataByLastUploader(t *testing.T) {
 	// new uploader object by last time uploader
 	newUploader, err := goar.CreateUploader(wallet.Client, lastUploader.FormatSerializedUploader(), bigData)
 	assert.NoError(t, err)
-	for !newUploader.IsComplete() {
-		err := newUploader.UploadChunk()
-		assert.NoError(t, err)
-	}
+	assert.NoError(t, newUploader.Once())
 
 	// end remove jsonUploaderFile.json file
 	_ = os.Remove("./jsonUploaderFile.json")

uploader.go

@@ -108,6 +108,20 @@ func CreateUploader(api *Client, upload interface{}, data []byte) (*TransactionU
 	return uploader, err
 }
 
+func (tt *TransactionUploader) Once() (err error) {
+	for !tt.IsComplete() {
+		if err = tt.UploadChunk(); err != nil {
+			return
+		}
+
+		if tt.LastResponseStatus != 200 {
+			return
+		}
+	}
+
+	return
+}
+
 func (tt *TransactionUploader) IsComplete() bool {
 	tChunks := tt.Transaction.Chunks
 	if tChunks == nil {

wallet.go

@@ -143,11 +143,6 @@ func (w *Wallet) SendTransaction(tx *types.Transaction) (id string, err error) {
 	if err != nil {
 		return
 	}
-	for !uploader.IsComplete() {
-		err = uploader.UploadChunk()
-		if err != nil {
-			return
-		}
-	}
+	err = uploader.Once()
 	return
 }