linter: Enable gofumpt and run against codebase (#1848)

* linter: Enable gofumpt and run against codebase

* Address shazbert's nits

* gofumpt: Fix issues after rebase
This commit is contained in:
Adrian Gallagher
2025-03-18 10:23:16 +11:00
committed by GitHub
parent 748ed71455
commit f5faca2eb2
189 changed files with 1541 additions and 1104 deletions

View File

@@ -143,7 +143,7 @@ func convertATR(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.AverageTrueRange,
},
@@ -178,7 +178,7 @@ func convertBollingerBands(a objects.Object) ([][]string, error) {
MAType = "MA_TYPE:EMA"
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.BollingerBands, "", MAType,
},
@@ -220,7 +220,7 @@ func convertEMA(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.ExponentialMovingAverage,
},
@@ -246,7 +246,7 @@ func convertMACD(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.MovingAverageConvergenceDivergence,
fmt.Sprintf("Period:%d Fast:%d Slow:%d",
@@ -293,7 +293,7 @@ func convertMFI(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.MoneyFlowIndex,
},
@@ -314,7 +314,7 @@ func convertMFI(a objects.Object) ([][]string, error) {
}
func convertOBV(a objects.Object) ([][]string, error) {
var bucket = [][]string{
bucket := [][]string{
{
indicators.OnBalanceVolume,
},
@@ -345,7 +345,7 @@ func convertRSI(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.RelativeStrengthIndex,
},
@@ -371,7 +371,7 @@ func convertSMA(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.SimpleMovingAverage,
},
@@ -397,7 +397,7 @@ func convertCorrelationCoefficient(a objects.Object) ([][]string, error) {
return nil, errors.New("casting failure")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.CorrelationCoefficient,
},
@@ -443,7 +443,7 @@ func convertOHLCV(a objects.Object) ([][]string, error) {
return nil, errors.New("cannot convert object to string")
}
var bucket = [][]string{
bucket := [][]string{
{
indicators.OHLCV, "Exchange:" + exchange, pair, asset, interval, "",
},

View File

@@ -773,7 +773,7 @@ func exchangeOHLCV(args ...objects.Object) (objects.Object, error) {
// parseInterval will parse the interval param of indictors that have them and convert to time.Duration
func parseInterval(in string) (time.Duration, error) {
if !common.StringSliceContainsInsensitive(supportedDurations, in) {
return time.Nanosecond, errInvalidInterval
return time.Nanosecond, kline.ErrInvalidInterval
}
switch in {
case "1d":

View File

@@ -8,9 +8,11 @@ import (
"time"
objects "github.com/d5/tengo/v2"
"github.com/stretchr/testify/assert"
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/exchanges/account"
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
"github.com/thrasher-corp/gocryptotrader/exchanges/kline"
"github.com/thrasher-corp/gocryptotrader/gctscript/modules"
"github.com/thrasher-corp/gocryptotrader/gctscript/wrappers/validator"
)
@@ -330,11 +332,7 @@ func TestParseInterval(t *testing.T) {
}
_, err = parseInterval("6m")
if err != nil {
if !errors.Is(err, errInvalidInterval) {
t.Error(err)
}
}
assert.ErrorIs(t, err, kline.ErrInvalidInterval, "parseInterval should return invalid interval for 6m")
}
func TestSetVerbose(t *testing.T) {

View File

@@ -1,8 +1,6 @@
package gct
import (
"errors"
objects "github.com/d5/tengo/v2"
)
@@ -13,8 +11,7 @@ const (
ErrEmptyParameter = "received empty parameter for %v"
)
var errInvalidInterval = errors.New("invalid interval")
var supportedDurations = []string{"1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "6h", "12h", "24h", "1d", "3d", "1w"}
var supportedDurations = []string{"1m", "3m", "5m", "15m", "30m", "1h", "2h", "4h", "6h", "12h", "24h", "1d", "3d", "1w", "1M"}
// Modules map of all loadable modules
var Modules = map[string]map[string]objects.Object{

View File

@@ -51,7 +51,7 @@ func (g *GctScriptManager) autoLoad() {
g.config.AutoLoad[x])
continue
}
var name = g.config.AutoLoad[x]
name := g.config.AutoLoad[x]
if filepath.Ext(name) != common.GctExt {
name += common.GctExt
}

View File

@@ -28,10 +28,8 @@ type Error struct {
Cause error
}
var (
// ScriptPath path to load/save scripts
ScriptPath string
)
// ScriptPath path to load/save scripts
var ScriptPath string
var (
// ErrScriptingDisabled error message displayed when gctscript is disabled

View File

@@ -398,7 +398,6 @@ func TestRemoveVM(t *testing.T) {
}
id, _ := uuid.FromString("6f20c907-64a0-48f2-848a-7837dee61672")
err := manager.RemoveVM(id)
if err != nil {
if err.Error() != "VM 6f20c907-64a0-48f2-848a-7837dee61672 not found" {
t.Fatal(err)

View File

@@ -99,9 +99,11 @@ func (w Wrapper) Pairs(exch string, _ bool, _ asset.Item) (*currency.Pairs, erro
return nil, errTestFailed
}
pairs, err := currency.NewPairsFromStrings([]string{"btc_usd",
pairs, err := currency.NewPairsFromStrings([]string{
"btc_usd",
"btc_aud",
"btc_ltc"})
"btc_ltc",
})
if err != nil {
return nil, err
}