Merge pull request #1545 from 0chain/hotfix/remove-sleep

Remove sleep in add web workers and return bool in createWorkers

wasmsdk/blobber.go

@@ -629,7 +629,7 @@ func multiUpload(jsonBulkUploadOptions string) (MultiUploadResult, error) {
 		result.Success = false
 		return result, errors.New("Error fetching the allocation")
 	}
-	addWebWorkers(allocationObj)
+
 	operationRequests := make([]sdk.OperationRequest, n)
 	for idx, option := range options {
 		wg := &sync.WaitGroup{}
@@ -1019,12 +1019,12 @@ func terminateWorkersWithAllocation(alloc *sdk.Allocation) {
 	}
 }
 
-func createWorkers(allocationID string) {
+func createWorkers(allocationID string) bool {
 	alloc, err := getAllocation(allocationID)
 	if err != nil {
-		return
+		return false
 	}
-	addWebWorkers(alloc)
+	return addWebWorkers(alloc)
 }
 
 func startListener() error {

wasmsdk/cache.go

@@ -6,7 +6,6 @@ package main
 import (
 	"time"
 
-	"github.com/0chain/gosdk/core/sys"
 	"github.com/0chain/gosdk/wasmsdk/jsbridge"
 	"github.com/0chain/gosdk/zboxcore/client"
 	"github.com/0chain/gosdk/zboxcore/sdk"
@@ -67,17 +66,17 @@ func reloadAllocation(allocationID string) (*sdk.Allocation, error) {
 	return it.Allocation, nil
 }
 
-func addWebWorkers(alloc *sdk.Allocation) {
+func addWebWorkers(alloc *sdk.Allocation) (isCreated bool) {
 	c := client.GetClient()
 	if c == nil || len(c.Keys) == 0 {
 		return
 	}
-	isCreated := false
+
 	for _, blober := range alloc.Blobbers {
-		_, isCreated, _ = jsbridge.NewWasmWebWorker(blober.ID, blober.Baseurl, c.ClientID, c.Keys[0].PublicKey, c.Keys[0].PrivateKey, c.Mnemonic) //nolint:errcheck
-	}
-	// wait for worker to be instantiated
-	if isCreated {
-		sys.Sleep(1 * time.Second)
+		_, workerCreated, _ := jsbridge.NewWasmWebWorker(blober.ID, blober.Baseurl, c.ClientID, c.Keys[0].PublicKey, c.Keys[0].PrivateKey, c.Mnemonic) //nolint:errcheck
+		if workerCreated {
+			isCreated = true
+		}
 	}
+	return
 }