Refactor common

cmd/add.go

@@ -3,15 +3,15 @@ package cmd
 import (
 	"log"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
 var addCmd = &cobra.Command{
-	Use:   "add",
-	Short: "Adds free storage assigner",
-	Long:  "Adds free storage assigner",
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "add",
+	Short:  "Adds free storage assigner",
+	Long:   "Adds free storage assigner",
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		var err error
@@ -34,7 +34,7 @@ var addCmd = &cobra.Command{
 			log.Fatal("invalid 'max' flag: ", err)
 		}
 
-		_, _, err = sdk.AddFreeStorageAssigner(name, key, limit, max)
+		_, _, err = commonsdk.AddFreeStorageAssigner(name, key, limit, max)
 		if err != nil {
 			log.Fatal("Error adding free storage assigner:", err)
 		}

cmd/challengepool.go

@@ -5,12 +5,12 @@ import (
 	"log"
 	"os"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/0chain/zboxcli/util"
 	"github.com/spf13/cobra"
 )
 
-func printChallengePoolInfo(info *sdk.ChallengePoolInfo) {
+func printChallengePoolInfo(info *commonsdk.ChallengePoolInfo) {
 	var header = []string{
 		"BALANCE", "START", "EXPIRE", "FINIALIZED",
 	}
@@ -49,8 +49,8 @@ var cpInfo = &cobra.Command{
 			log.Fatalf("can't get 'allocation' flag: %v", err)
 		}
 
-		var info *sdk.ChallengePoolInfo
-		if info, err = sdk.GetChallengePoolInfo(allocID); err != nil {
+		var info *commonsdk.ChallengePoolInfo
+		if info, err = commonsdk.GetChallengePoolInfo(allocID); err != nil {
 			log.Fatalf("Failed to get challenge pool info: %v", err)
 		}
 		if doJSON {

cmd/collect_reward.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"log"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
@@ -36,9 +36,9 @@ var collectRewards = &cobra.Command{
 
 		switch providerName {
 		case "blobber":
-			_, _, err = sdk.CollectRewards(providerId, sdk.ProviderBlobber)
+			_, _, err = commonsdk.CollectRewards(providerId, commonsdk.ProviderBlobber)
 		case "validator":
-			_, _, err = sdk.CollectRewards(providerId, sdk.ProviderValidator)
+			_, _, err = commonsdk.CollectRewards(providerId, commonsdk.ProviderValidator)
 		default:
 			log.Fatal("provider type must be blobber or validator")
 		}

cmd/copy.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/constants"
 	"github.com/spf13/cobra"
 )
 

cmd/createdir.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/constants"
 	"github.com/spf13/cobra"
 )
 

cmd/delete.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/constants"
 	"github.com/spf13/cobra"
 )
 

cmd/download.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/0chain/gosdk/zboxcore/fileref"
+	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
 	"github.com/0chain/zboxcli/util"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
 	"github.com/spf13/cobra"
 )
 

cmd/download_m3u8.go

@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/0chain/gosdk/zboxcore/logger"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/logger"
 )
 
 // M3u8Downloader download files from blobber's dir, and build them into a local m3u8 playlist

cmd/fileRefs.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
 	"github.com/0chain/zboxcli/util"
 	"github.com/spf13/cobra"
 )
@@ -25,10 +25,10 @@ func checkError(err error) {
 }
 
 var fileRefsCmd = &cobra.Command{
-	Use:   "recent-refs",
-	Short: "get list of recently added refs",
-	Long:  `get list of recently added refs`,
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "recent-refs",
+	Short:  "get list of recently added refs",
+	Long:   `get list of recently added refs`,
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		page, err := cmd.Flags().GetUint("page")

cmd/filemeta.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
 	"github.com/0chain/zboxcli/util"
 	"github.com/spf13/cobra"
 )

cmd/finalizeallocation.go

@@ -5,6 +5,7 @@ import (
 	"log"
 
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
@@ -49,7 +50,7 @@ and empties write pool moving left tokens to client.`,
 		// check out allocation first
 		allocShouldNotBeFinalized(allocID)
 
-		txnHash, _, err := sdk.FinalizeAllocation(allocID)
+		txnHash, _, err := commonsdk.FinalizeAllocation(allocID)
 		if err != nil {
 			// check again, a blobber can finalize it
 			allocShouldNotBeFinalized(allocID)
@@ -83,7 +84,7 @@ allocation flow.`,
 			log.Fatal("invalid 'allocation' flag: ", err)
 		}
 
-		txnHash, _, err := sdk.CancelAllocation(allocID)
+		txnHash, _, err := commonsdk.CancelAllocation(allocID)
 		if err != nil {
 			log.Fatal("Error canceling allocation:", err)
 		}

cmd/get_download_cost.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/0chain/gosdk/core/common"
-	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/core/common"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
 	"github.com/spf13/cobra"
 )
 
@@ -31,7 +32,7 @@ func calculateDownloadCost(alloc *sdk.Allocation, fileSize int64, numBlocks int6
 	return balance
 }
 
-func downloadCost(alloc *sdk.Allocation, meta *sdk.ConsolidatedFileMeta, blocksPerMarker int) {
+func downloadCost(alloc *sdk.Allocation, meta *commonsdk.ConsolidatedFileMeta, blocksPerMarker int) {
 	if meta.Type != fileref.FILE {
 		log.Fatal("not a file")
 	}
@@ -105,7 +106,7 @@ var getDownloadCostCmd = &cobra.Command{
 
 		var (
 			alloc *sdk.Allocation
-			meta  *sdk.ConsolidatedFileMeta
+			meta  *commonsdk.ConsolidatedFileMeta
 		)
 
 		if remotePath != "" {

cmd/get_upload_cost.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/core/common"
 	"github.com/spf13/cobra"
 )
 

cmd/getallocation.go

@@ -5,11 +5,12 @@ import (
 	"log"
 	"os"
 
-	"github.com/0chain/gosdk/core/common"
-	"github.com/0chain/gosdk/zboxcore/blockchain"
-	"github.com/0chain/gosdk/zboxcore/fileref"
-	"github.com/0chain/gosdk/zboxcore/logger"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/core/common"
+	"github.com/0chain/gosdk_common/zboxcore/blockchain"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
+	"github.com/0chain/gosdk_common/zboxcore/logger"
 	"github.com/0chain/zboxcli/util"
 
 	"github.com/spf13/cobra"
@@ -47,7 +48,7 @@ var getallocationCmd = &cobra.Command{
 			return "(not found)"
 		}
 
-		var priceRangeString = func(pr sdk.PriceRange) string {
+		var priceRangeString = func(pr commonsdk.PriceRange) string {
 			return fmt.Sprintf("%s-%s", common.Balance(pr.Min), common.Balance(pr.Max))
 		}
 

cmd/getmpt.go

@@ -7,22 +7,22 @@ import (
 	"log"
 	"strings"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
 var getMptKeyCommand = &cobra.Command{
-	Use:   "get-mpt",
-	Short: "Directly view blockchain data",
-	Long:  `Directly view blockchain data from MPT key`,
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "get-mpt",
+	Short:  "Directly view blockchain data",
+	Long:   `Directly view blockchain data from MPT key`,
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		if cmd.Flags().Changed("key") == false {
 			log.Fatal("Required Mpt key missing\n")
 		}
 		key := cmd.Flag("key").Value.String()
-		jsonBytes, err := sdk.GetMptData(key)
+		jsonBytes, err := commonsdk.GetMptData(key)
 		if err != nil {
 			log.Fatalf("Failed to get Mpt key: %v\n", err)
 		}

cmd/kill_blobber.go

@@ -3,8 +3,7 @@ package cmd
 import (
 	"log"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
-
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +22,7 @@ var killBlobberCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal("invalid 'blobber id flag: ", err)
 		}
-		_, _, err = sdk.KillProvider(blobberId, sdk.ProviderBlobber)
+		_, _, err = commonsdk.KillProvider(blobberId, commonsdk.ProviderBlobber)
 		if err != nil {
 			log.Fatal("failed to kill blobber "+blobberId, err)
 		}

cmd/kill_validator.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"log"
 
-	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/commonsdk"
 	"github.com/spf13/cobra"
 )
 
@@ -23,7 +23,7 @@ var killValidatorCmd = &cobra.Command{
 			log.Fatal("invalid 'validator id flag: ", err)
 		}
 
-		_, _, err = sdk.KillProvider(validatorId, sdk.ProviderValidator)
+		_, _, err = commonsdk.KillProvider(validatorId, commonsdk.ProviderValidator)
 		if err != nil {
 			log.Fatal("failed to kill validator, id: "+validatorId, err)
 		}

cmd/list.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/zboxcore/fileref"
 	"github.com/0chain/zboxcli/util"
 	"github.com/spf13/cobra"
 )

cmd/listallocations.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/core/common"
 	"github.com/0chain/zboxcli/util"
 
 	"github.com/spf13/cobra"

cmd/move.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/zboxcore/sdk"
+	"github.com/0chain/gosdk_common/constants"
 	"github.com/spf13/cobra"
 )