Merge pull request #1451 from 0chain/refactor/deployment

Refactor/deployment

Author: dabasov

.github/workflows/tests.yml

@@ -35,9 +35,6 @@ jobs:
       - name: Build Base
         run: ./docker.local/bin/build.base.sh
 
-      - name: Check swagger generation
-        run: docker.local/bin/test.swagger.sh
-
       - name: Golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

code/go/0chain.net/blobber/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"github.com/0chain/blobber/code/go/0chain.net/core/common"
 	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	"github.com/0chain/blobber/code/go/0chain.net/core/node"
 )
@@ -43,10 +44,14 @@ func main() {
 	// when enabled "// +build integration_tests", this sets blobber for conductor tests.
 	prepareBlobber(node.Self.ID)
 
-	if err := registerOnChain(); err != nil {
-		logging.Logger.Error("Error register on blockchain" + err.Error())
-		panic(err)
-	}
+	go func() {
+		if err := registerOnChain(); err != nil {
+			logging.Logger.Error("Error register on blockchain" + err.Error())
+			panic(err)
+		}
+
+		common.SetBlobberRegistered(true)
+	}()
 
 	if err := setStorageScConfigFromChain(); err != nil {
 		logging.Logger.Error("Error setStorageScConfigFromChain" + err.Error())

code/go/0chain.net/blobber/zcn.go

@@ -2,17 +2,18 @@ package main
 
 import (
 	"fmt"
-	"time"
-
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/config"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/handler"
 	"github.com/0chain/blobber/code/go/0chain.net/core/chain"
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
 	handleCommon "github.com/0chain/blobber/code/go/0chain.net/core/common/handler"
+	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	"github.com/0chain/blobber/code/go/0chain.net/core/node"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/0chain/gosdk/zcncore"
+	"go.uber.org/zap"
+	"time"
 )
 
 func registerOnChain() error {
@@ -31,8 +32,9 @@ func registerOnChain() error {
 		return err
 	}
 
-	// setup blobber (add or update) on the blockchain (multiple attempts)
-	for i := 1; i <= 10; i++ {
+	// setup blobber (add) on the blockchain (multiple attempts)
+	i := 1
+	for {
 		if i == 1 {
 			fmt.Printf("\r	+ connect to sharders:")
 		} else {
@@ -50,6 +52,9 @@ func registerOnChain() error {
 		err = handler.RegisterBlobber(common.GetRootContext())
 		if err == nil {
 			break
+		} else {
+			i++
+			logging.Logger.Error("add_blobber_error", zap.Error(err))
 		}
 	}