fix: return an explicit error instead of panic and optimize the error…

… log (#339) (#341)
bittorrent · Jul 28, 2023 · a791ada · a791ada
1 parent 58978cb
commit a791ada
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/chain/chain.go b/chain/chain.go
@@ -5,12 +5,13 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/bittorrent/go-btfs/chain/tokencfg"
 	"io"
 	"math/big"
 	"strings"
 	"time"
 
+	"github.com/bittorrent/go-btfs/chain/tokencfg"
+
 	"github.com/bittorrent/go-btfs/accounting"
 	"github.com/bittorrent/go-btfs/chain/config"
 	"github.com/bittorrent/go-btfs/settlement"
@@ -348,7 +349,7 @@ func initSwap(
 	priceOracle := priceoracle.New(currentPriceOracleAddress, transactionService)
 	_, err := priceOracle.CheckNewPrice(tokencfg.GetWbttToken()) // CheckNewPrice when node starts
 	if err != nil {
-		return nil, nil, errors.New("CheckNewPrice " + err.Error())
+		return nil, nil, errors.New("CheckNewPrice error, it may happens when contract call failed if bttc chain rpc is down, please try again")
 	}
 
 	swapProtocol := swapprotocol.New(overlayEthAddress, priceOracle)

diff --git a/core/commands/commands.go b/core/commands/commands.go
@@ -12,7 +12,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/bittorrent/go-btfs-cmds"
+	cmds "github.com/bittorrent/go-btfs-cmds"
 )
 
 type commandEncoder struct {

diff --git a/core/commands/storage/upload/upload/upload.go b/core/commands/storage/upload/upload/upload.go
@@ -4,15 +4,18 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/bittorrent/go-btfs/chain/tokencfg"
-	"github.com/bittorrent/go-btfs/utils"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/bittorrent/go-btfs/chain/tokencfg"
+	"github.com/bittorrent/go-btfs/utils"
+	coreiface "github.com/bittorrent/interface-go-btfs-core"
+
 	"github.com/bittorrent/go-btfs/settlement/swap/swapprotocol"
 
 	"github.com/bittorrent/go-btfs/chain"
+	"github.com/bittorrent/go-btfs/core/commands/cmdenv"
 	"github.com/bittorrent/go-btfs/core/commands/storage/hosts"
 	"github.com/bittorrent/go-btfs/core/commands/storage/upload/helper"
 	"github.com/bittorrent/go-btfs/core/commands/storage/upload/offline"
@@ -111,7 +114,15 @@ Use status command to check for completion:
 	},
 	RunTimeout: 15 * time.Minute,
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
-		err := utils.CheckSimpleMode(env)
+		nd, err := cmdenv.GetNode(env)
+		if err != nil {
+			return err
+		}
+
+		if !nd.IsOnline {
+			return coreiface.ErrOffline
+		}
+		err = utils.CheckSimpleMode(env)
 		if err != nil {
 			return err
 		}