fix(): modify submint tx and chunk err process

Author: zyjblockchain

types/const.go

@@ -34,13 +34,14 @@ const (
 
 // Errors from /chunk we should never try and continue on.
 var FATAL_CHUNK_UPLOAD_ERRORS = map[string]struct{}{
-	"invalid_json":                     struct{}{},
-	"chunk_too_big":                    struct{}{},
-	"data_path_too_big":                struct{}{},
-	"offset_too_big":                   struct{}{},
-	"data_size_too_big":                struct{}{},
-	"chunk_proof_ratio_not_attractive": struct{}{},
-	"invalid_proof":                    struct{}{},
+	"{\"error\":\"disk_full\"}":                        struct{}{},
+	"{\"error\":\"invalid_json\"}":                     struct{}{},
+	"{\"error\":\"chunk_too_big\"}":                    struct{}{},
+	"{\"error\":\"data_path_too_big\"}":                struct{}{},
+	"{\"error\":\"offset_too_big\"}":                   struct{}{},
+	"{\"error\":\"data_size_too_big\"}":                struct{}{},
+	"{\"error\":\"chunk_proof_ratio_not_attractive\"}": struct{}{},
+	"{\"error\":\"invalid_proof\"}":                    struct{}{},
 }
 
 // about bundle

uploader.go

@@ -217,15 +217,16 @@ func (tt *TransactionUploader) UploadChunk() error {
 	if err != nil {
 		return err
 	}
-	_, statusCode, err := tt.Client.SubmitChunks(gc)
+	body, statusCode, err := tt.Client.SubmitChunks(gc) // always body is errMsg
 	tt.LastRequestTimeEnd = time.Now().UnixNano() / 1000000
 	tt.LastResponseStatus = statusCode
 	if statusCode == 200 {
 		tt.ChunkIndex++
-	} else if err != nil {
-		tt.LastResponseError = err.Error()
-		if _, ok := types.FATAL_CHUNK_UPLOAD_ERRORS[err.Error()]; ok {
-			return errors.New(fmt.Sprintf("Fatal error uploading chunk %d:%v", tt.ChunkIndex, err))
+	} else {
+		errStr := fmt.Sprintf("%s,%v,%d", body, err, statusCode)
+		tt.LastResponseError = errStr
+		if _, ok := types.FATAL_CHUNK_UPLOAD_ERRORS[body]; ok {
+			return errors.New(fmt.Sprintf("Fatal error uploading chunk %d:%v", tt.ChunkIndex, body))
 		}
 	}
 	return nil
@@ -315,10 +316,11 @@ func (tt *TransactionUploader) uploadTx(withBody bool) error {
 		// Post the Transaction with Data.
 		tt.Transaction.Data = utils.Base64Encode(tt.Data)
 	}
-	_, 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))
+	body, statusCode, err := tt.Client.SubmitTransaction(tt.Transaction)
+	if err != nil || statusCode >= 400 {
+		tt.LastResponseError = fmt.Sprintf("%v,%s", err, body)
+		tt.LastResponseStatus = statusCode
+		return errors.New(fmt.Sprintf("Unable to upload Transaction: %d, %v, %s", statusCode, err, body))
 	}
 
 	tt.LastRequestTimeEnd = time.Now().UnixNano() / 1000000
@@ -328,6 +330,7 @@ func (tt *TransactionUploader) uploadTx(withBody bool) error {
 		tt.Transaction.Data = ""
 	}
 
+	// tx already processed
 	if statusCode >= 200 && statusCode < 300 {
 		tt.TxPosted = true
 		if withBody {