Provider update 1.1.1 (#69)

cmd/canined/file_server.go

@@ -223,6 +223,7 @@ func (q *UploadQueue) makeContract(cmd *cobra.Command, args []string, wg *sync.W
 		Message:  msg,
 		Callback: wg,
 		Err:      nil,
+		Response: nil,
 	}
 
 	k := &u
@@ -344,7 +345,7 @@ func StartFileServer(cmd *cobra.Command) {
 
 	handler := cors.Default().Handler(router)
 
-	go postProofs(cmd, db)
+	go postProofs(cmd, db, &q)
 	go q.startListener(clientCtx, cmd)
 	go q.checkStrays(clientCtx, cmd, db)
 

cmd/canined/proofs.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"strconv"
+	"sync"
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -88,7 +89,7 @@ func CreateMerkleForProof(cmd *cobra.Command, filename string, index int) (strin
 
 }
 
-func postProof(cmd *cobra.Command, cid string, block string, db *leveldb.DB) (*sdk.TxResponse, error) {
+func postProof(cmd *cobra.Command, cid string, block string, db *leveldb.DB, queue *UploadQueue) (*sdk.TxResponse, error) {
 	clientCtx, err := client.GetClientTxContext(cmd)
 	if err != nil {
 		return nil, err
@@ -119,15 +120,23 @@ func postProof(cmd *cobra.Command, cid string, block string, db *leveldb.DB) (*s
 		return nil, err
 	}
 
-	res, err := SendTx(clientCtx, cmd.Flags(), msg)
-	if err != nil {
-		return nil, err
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	u := Upload{
+		Message:  msg,
+		Err:      nil,
+		Callback: &wg,
+		Response: nil,
 	}
 
-	return res, nil
+	queue.append(&u)
+	wg.Wait()
+
+	return u.Response, u.Err
 }
 
-func postProofs(cmd *cobra.Command, db *leveldb.DB) {
+func postProofs(cmd *cobra.Command, db *leveldb.DB, queue *UploadQueue) {
 	debug, err := cmd.Flags().GetBool("debug")
 	if err != nil {
 		return
@@ -216,7 +225,7 @@ func postProofs(cmd *cobra.Command, db *leveldb.DB) {
 				continue
 			}
 
-			res, err := postProof(cmd, cid, block, db)
+			res, err := postProof(cmd, cid, block, db, queue)
 			if err != nil {
 				fmt.Printf("Posting Error: %s\n", err.Error())
 				continue
@@ -229,6 +238,9 @@ func postProofs(cmd *cobra.Command, db *leveldb.DB) {
 		}
 		iter.Release()
 		err = iter.Error()
+		if err != nil {
+			fmt.Printf("Iterator Error: %s\n", err.Error())
+		}
 
 		time.Sleep(time.Duration(interval) * time.Second)
 	}

cmd/canined/queue.go

@@ -15,6 +15,10 @@ import (
 	ctypes "github.com/cosmos/cosmos-sdk/types"
 )
 
+func (q *UploadQueue) append(upload *Upload) {
+	q.Queue = append(q.Queue, upload)
+}
+
 func (q *UploadQueue) checkStrays(clientCtx client.Context, cmd *cobra.Command, db *leveldb.DB) {
 	for {
 		time.Sleep(time.Second)
@@ -83,6 +87,7 @@ func (q *UploadQueue) checkStrays(clientCtx client.Context, cmd *cobra.Command,
 				Message:  msg,
 				Callback: nil,
 				Err:      nil,
+				Response: nil,
 			}
 
 			q.Queue = append(q.Queue, &u)
@@ -95,7 +100,7 @@ func (q *UploadQueue) checkStrays(clientCtx client.Context, cmd *cobra.Command,
 
 func (q *UploadQueue) startListener(clientCtx client.Context, cmd *cobra.Command) error {
 	for {
-		time.Sleep(time.Second)
+		time.Sleep(time.Second * 2)
 
 		if q.Locked {
 			continue
@@ -122,6 +127,8 @@ func (q *UploadQueue) startListener(clientCtx client.Context, cmd *cobra.Command
 			} else {
 				if res.Code != 0 {
 					v.Err = fmt.Errorf(res.RawLog)
+				} else {
+					v.Response = res
 				}
 			}
 			v.Callback.Done()

cmd/canined/types.go

@@ -4,6 +4,7 @@ import (
 	"sync"
 
 	"github.com/cosmos/cosmos-sdk/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 const MaxFileSize = 32 << 30
@@ -41,6 +42,7 @@ type Upload struct {
 	Message  types.Msg
 	Callback *sync.WaitGroup
 	Err      error
+	Response *sdk.TxResponse
 }
 
 type UploadQueue struct {