Skip to content

remove log imports #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dabasov merged 1 commit into from
Mar 23, 2025
Merged

remove log imports #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmd/challengepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cmd

import (
"fmt"
"log"
"os"

"github.com/0chain/gosdk/zboxcore/sdk"
Expand Down Expand Up @@ -42,16 +41,16 @@ var cpInfo = &cobra.Command{
doJSON, _ := cmd.Flags().GetBool("json")

if !flags.Changed("allocation") {
log.Fatal("missing required 'allocation' flag")
Fatal("missing required 'allocation' flag")
}

if allocID, err = flags.GetString("allocation"); err != nil {
log.Fatalf("can't get 'allocation' flag: %v", err)
Fatalf("can't get 'allocation' flag: %v", err)
}

var info *sdk.ChallengePoolInfo
if info, err = sdk.GetChallengePoolInfo(allocID); err != nil {
log.Fatalf("Failed to get challenge pool info: %v", err)
Fatalf("Failed to get challenge pool info: %v", err)
}
if doJSON {
util.PrintJSON(info)
Expand Down
12 changes: 11 additions & 1 deletion cmd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,17 @@ func PrintError(v ...interface{}) {
}

func PrintInfo(v ...interface{}) {
fmt.Fprintln(os.Stdin, v...)
fmt.Fprintln(os.Stdout, v...)
}

func Fatal(v ...interface{}) {
fmt.Fprintln(os.Stderr, v...)
os.Exit(1)
}

func Fatalf(format string, v ...interface{}) {
fmt.Fprintf(os.Stderr, format, v...)
os.Exit(1)
}

func init() {
Expand Down
31 changes: 15 additions & 16 deletions cmd/get_download_cost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cmd

import (
"fmt"
"log"

"github.com/0chain/gosdk/core/common"
"github.com/0chain/gosdk/zboxcore/fileref"
Expand All @@ -17,7 +16,7 @@ func calculateDownloadCost(alloc *sdk.Allocation, fileSize int64, numBlocks int6
for _, d := range alloc.BlobberDetails {
readPrice, err := d.Terms.ReadPrice.ToToken()
if err != nil {
log.Fatalf("failed to convert %v to token, %v", d.Terms.ReadPrice, err)
Fatalf("failed to convert %v to token, %v", d.Terms.ReadPrice, err)
}

cost += sizeInGB(numBlocks*fileref.CHUNK_SIZE) * float64(readPrice)
Expand All @@ -26,14 +25,14 @@ func calculateDownloadCost(alloc *sdk.Allocation, fileSize int64, numBlocks int6

balance, err := common.ToBalance(cost)
if err != nil {
log.Fatalf("failed to convert %v to balance, %v", cost, err)
Fatalf("failed to convert %v to balance, %v", cost, err)
}
return balance
}

func downloadCost(alloc *sdk.Allocation, meta *sdk.ConsolidatedFileMeta, blocksPerMarker int) {
if meta.Type != fileref.FILE {
log.Fatal("not a file")
Fatal("not a file")
}

shardSize := (meta.ActualFileSize + int64(alloc.DataShards) - 1) / int64(alloc.DataShards)
Expand Down Expand Up @@ -61,18 +60,18 @@ var getDownloadCostCmd = &cobra.Command{
)

if !fflags.Changed("allocation") {
log.Fatal("missing required 'allocation' flag")
Fatal("missing required 'allocation' flag")
}

allocID = cmd.Flag("allocation").Value.String()
blocksPerMarker, err := cmd.Flags().GetInt("blocks-per-marker")

if err != nil {
log.Fatal("invalid blocks-per-marker value: ", err)
Fatal("invalid blocks-per-marker value: ", err)
}

if blocksPerMarker <= 0 {
log.Fatal("blocks-per-marker value cannot be <= 0")
Fatal("blocks-per-marker value cannot be <= 0")
}

var (
Expand All @@ -83,24 +82,24 @@ var getDownloadCostCmd = &cobra.Command{

if fflags.Changed("remotepath") {
if remotePath, err = fflags.GetString("remotepath"); err != nil {
log.Fatal("invalid 'remotepath' flag: ", err)
Fatal("invalid 'remotepath' flag: ", err)
}
}

if fflags.Changed("authticket") {
if authTicket, err = fflags.GetString("authticket"); err != nil {
log.Fatal("invalid 'authticket' flag: ", err)
Fatal("invalid 'authticket' flag: ", err)
}
}

if fflags.Changed("lookuphash") {
if lookupHash, err = fflags.GetString("lookuphash"); err != nil {
log.Fatal("invalid 'lookuphash' flag: ", err)
Fatal("invalid 'lookuphash' flag: ", err)
}
}

if remotePath == "" && authTicket == "" {
log.Fatal("'remotepath' or 'authticket' flag required")
Fatal("'remotepath' or 'authticket' flag required")
}

var (
Expand All @@ -113,11 +112,11 @@ var getDownloadCostCmd = &cobra.Command{
// by remote path

if alloc, err = sdk.GetAllocation(allocID); err != nil {
log.Fatal("fetching the allocation: ", err)
Fatal("fetching the allocation: ", err)
}

if meta, err = alloc.GetFileMeta(remotePath); err != nil {
log.Fatal("can't get file meta: ", err)
Fatal("can't get file meta: ", err)
}

downloadCost(alloc, meta, blocksPerMarker)
Expand All @@ -128,19 +127,19 @@ var getDownloadCostCmd = &cobra.Command{

alloc, err = sdk.GetAllocationFromAuthTicket(authTicket)
if err != nil {
log.Fatal("can't get allocation object: ", err)
Fatal("can't get allocation object: ", err)
}
var at = sdk.InitAuthTicket(authTicket)

if lookupHash == "" {
if lookupHash, err = at.GetLookupHash(); err != nil {
log.Fatal("can't get lookup hash from auth ticket: ", err)
Fatal("can't get lookup hash from auth ticket: ", err)
}
}

meta, err = alloc.GetFileMetaFromAuthTicket(authTicket, lookupHash)
if err != nil {
log.Fatal("can't get file meta: ", err)
Fatal("can't get file meta: ", err)
}

downloadCost(alloc, meta, blocksPerMarker)
Expand Down
21 changes: 10 additions & 11 deletions cmd/get_upload_cost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cmd

import (
"fmt"
"log"
"os"
"time"

Expand All @@ -28,47 +27,47 @@ var getUploadCostCmd = &cobra.Command{
)

if !fflags.Changed("allocation") {
log.Fatal("missing required 'allocation' flag")
Fatal("missing required 'allocation' flag")
}

allocID = cmd.Flag("allocation").Value.String()

var localPath string

if !fflags.Changed("localpath") {
log.Fatal("missing requried 'localpath' flag")
Fatal("missing requried 'localpath' flag")
}

if localPath, err = fflags.GetString("localpath"); err != nil {
log.Fatal("invalid 'localpath' flag: ", err)
Fatal("invalid 'localpath' flag: ", err)
}

if localPath == "" {
log.Fatal("empty local path")
Fatal("empty local path")
}

var fi os.FileInfo
if fi, err = os.Stat(localPath); err != nil {
log.Fatal(err)
Fatal(err)
}

if !fi.Mode().IsRegular() {
log.Fatal("not a regular file")
Fatal("not a regular file")
}

if duration, err = fflags.GetDuration("duration"); err != nil {
log.Fatal("invalid 'duration' flag:", err)
Fatal("invalid 'duration' flag:", err)
} else if duration < 0 {
log.Fatal("negative duration not allowed: ", duration)
Fatal("negative duration not allowed: ", duration)
}

if end, err = fflags.GetBool("end"); err != nil {
log.Fatal("invalid 'end' flag:", err)
Fatal("invalid 'end' flag:", err)
}

var alloc *sdk.Allocation
if alloc, err = sdk.GetAllocation(allocID); err != nil {
log.Fatal("fetching the allocation: ", err)
Fatal("fetching the allocation: ", err)
}

// until allocation ends
Expand Down
7 changes: 3 additions & 4 deletions cmd/getallocation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package cmd

import (
"fmt"
"log"
"os"

"github.com/0chain/gosdk/core/common"
Expand Down Expand Up @@ -32,7 +31,7 @@ var getallocationCmd = &cobra.Command{
alloc, err := sdk.GetAllocation(allocationID)
if err != nil {
logger.Logger.Error("Error fetching the allocation", err)
log.Fatal("Error fetching/verifying the allocation")
Fatal("Error fetching/verifying the allocation")
}
if doJSON {
util.PrintJSON(alloc)
Expand All @@ -53,11 +52,11 @@ var getallocationCmd = &cobra.Command{

blocksPerMarker, err := cmd.Flags().GetInt("blocks-per-marker")
if err != nil {
log.Fatal("invalid blocks-per-marker. Error: ", err)
Fatal("invalid blocks-per-marker. Error: ", err)
}

if blocksPerMarker <= 0 {
log.Fatal("invalid blocks-per-marker. Should be greater than 0")
Fatal("invalid blocks-per-marker. Should be greater than 0")
}

fmt.Println("allocation:")
Expand Down
7 changes: 3 additions & 4 deletions cmd/getmpt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"encoding/json"
"fmt"
"log"
"strings"

"github.com/0chain/gosdk/zboxcore/sdk"
Expand All @@ -19,18 +18,18 @@ var getMptKeyCommand = &cobra.Command{
Hidden: true,
Run: func(cmd *cobra.Command, args []string) {
if cmd.Flags().Changed("key") == false {
log.Fatal("Required Mpt key missing\n")
Fatal("Required Mpt key missing\n")
}
key := cmd.Flag("key").Value.String()
jsonBytes, err := sdk.GetMptData(key)
if err != nil {
log.Fatalf("Failed to get Mpt key: %v\n", err)
Fatalf("Failed to get Mpt key: %v\n", err)
}

var indented bytes.Buffer
err = json.Indent(&indented, jsonBytes, "", "\t")
if err != nil {
log.Fatalf("Result %s baddly formated: %v\n", string(jsonBytes), err)
Fatalf("Result %s baddly formated: %v\n", string(jsonBytes), err)
}

noBackSlash := strings.Replace(indented.String(), "\\", "", -1)
Expand Down
5 changes: 2 additions & 3 deletions cmd/rename.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cmd

import (
"fmt"
"os"

"github.com/0chain/gosdk/constants"
Expand Down Expand Up @@ -41,7 +40,7 @@ var renameCmd = &cobra.Command{
destName := cmd.Flag("destname").Value.String()
oldName := pathutil.Dir(remotePath)
if oldName == destName {
fmt.Println(remotePath + " renamed")
PrintInfo(remotePath + " renamed")
return
}

Expand All @@ -56,7 +55,7 @@ var renameCmd = &cobra.Command{
PrintError("Rename failed.", err)
os.Exit(1)
}
fmt.Println(remotePath + " renamed")
PrintInfo(remotePath + " renamed")
},
}

Expand Down
Loading
Loading