Merge branch 'sprint-1.16' into feat/ref-index

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:

Makefile

@@ -188,3 +188,10 @@ else
 	sed -i "s/BUF_VERSION := [0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/BUF_VERSION := $(VERSION)/g" Makefile
 endif
 endif
+
+.PHONY: markdown-docs
+markdown-docs:
+	swagger generate spec -o ./swagger.yaml -w ./code/go/0chain.net -m
+	sed -i '' "s/in\:\ form/in\:\ formData/g" ./swagger.yaml
+	yq -i '(.paths.*.*.parameters.[] | select(.in == "formData") | select(.type == "object")).type = "file"' swagger.yaml
+	swagger generate markdown -f ./swagger.yaml --output=swagger.md

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))
 		}
 	}
 

code/go/0chain.net/blobbercore/allocation/entity.go

@@ -38,6 +38,7 @@ const (
 	CanRenameMask       = uint16(32) // 0010 0000
 )
 
+// swagger:model Allocation
 type Allocation struct {
 	ID             string           `gorm:"column:id;size:64;primaryKey"`
 	Tx             string           `gorm:"column:tx;size:64;not null;unique;index:idx_unique_allocations_tx,unique"`
@@ -239,6 +240,7 @@ const (
 )
 
 // Terms for allocation by its Tx.
+// swagger:model
 type Terms struct {
 	ID           int64      `gorm:"column:id;primaryKey"`
 	BlobberID    string     `gorm:"blobber_id;size:64;not null"`

code/go/0chain.net/blobbercore/allocation/file_changer_base.go

@@ -11,6 +11,7 @@ import (
 	"github.com/0chain/blobber/code/go/0chain.net/core/encryption"
 )
 
+// swagger:model BaseFileChanger 
 // BaseFileChanger base file change processor
 type BaseFileChanger struct {
 	//client side: unmarshal them from 'updateMeta'/'uploadMeta'

code/go/0chain.net/blobbercore/allocation/file_changer_upload.go

@@ -16,6 +16,7 @@ import (
 	"github.com/0chain/blobber/code/go/0chain.net/core/common"
 )
 
+// swagger:model UploadFileChanger
 // UploadFileChanger file change processor for continuous upload in INIT/APPEND/FINALIZE
 type UploadFileChanger struct {
 	BaseFileChanger

code/go/0chain.net/blobbercore/blobberhttp/response.go

@@ -55,6 +55,7 @@ type ListResult struct {
 	Entities       []map[string]interface{} `json:"list"`
 }
 
+// swagger:model DownloadResponse
 type DownloadResponse struct {
 	Success      bool                   `json:"success"`
 	Data         []byte                 `json:"data"`
@@ -63,6 +64,7 @@ type DownloadResponse struct {
 	LatestRM     *readmarker.ReadMarker `json:"latest_rm"`
 }
 
+// swagger:model LatestWriteMarkerResult
 type LatestWriteMarkerResult struct {
 	LatestWM *writemarker.WriteMarker `json:"latest_write_marker"`
 	PrevWM   *writemarker.WriteMarker `json:"prev_write_marker"`

code/go/0chain.net/blobbercore/challenge/timing.go

@@ -12,6 +12,7 @@ import (
 	"gorm.io/gorm/clause"
 )
 
+// swagger:model ChallengeTiming
 type ChallengeTiming struct {
 	// ChallengeID is the challenge ID generated on blockchain.
 	ChallengeID string `gorm:"column:challenge_id;size:64;primaryKey" json:"id"`

code/go/0chain.net/blobbercore/filestore/store.go

@@ -90,6 +90,7 @@ func GetFileStore() FileStorer {
 	return fileStore
 }
 
+// swagger:model FileDownloadResponse
 type FileDownloadResponse struct {
 	Nodes   [][][]byte
 	Indexes [][]int