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

@@ -188,7 +188,7 @@ func (c *CurrencyStateManager) GetAllRPC(exchName string) (*gctrpc.CurrencyState
return nil, err
}
var resp = &gctrpc.CurrencyStateResponse{}
resp := &gctrpc.CurrencyStateResponse{}
for x := range sh {
resp.CurrencyStates = append(resp.CurrencyStates, &gctrpc.CurrencyState{
Currency: sh[x].Code.String(),

View File

@@ -158,7 +158,8 @@ func TestCurrencyStateManagerIsRunning(t *testing.T) {
man := &CurrencyStateManager{
shutdown: make(chan struct{}),
iExchangeManager: &fakeExchangeManagerino{ErrorMeOne: true},
sleep: time.Minute}
sleep: time.Minute,
}
err = man.Start()
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)

View File

@@ -923,7 +923,8 @@ func createDHM(t *testing.T) (*DataHistoryManager, *datahistoryjob.DataHistoryJo
b.CurrencyPairs.Pairs[asset.Spot] = &currency.PairStore{
Available: currency.Pairs{cp, cp2},
Enabled: currency.Pairs{cp, cp2},
AssetEnabled: true}
AssetEnabled: true,
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)

View File

@@ -16,8 +16,10 @@ import (
const dataHistoryManagerName = "data_history_manager"
type dataHistoryStatus int64
type dataHistoryDataType int64
type (
dataHistoryStatus int64
dataHistoryDataType int64
)
// Data type descriptors
const (

View File

@@ -211,8 +211,9 @@ func TestUnloadExchange(t *testing.T) {
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
}
e := &Engine{ExchangeManager: em,
Config: &config.Config{Exchanges: []config.Exchange{{Name: testExchange}}},
e := &Engine{
ExchangeManager: em,
Config: &config.Config{Exchanges: []config.Exchange{{Name: testExchange}}},
}
err = e.UnloadExchange("asdf")
if !errors.Is(err, config.ErrExchangeNotFound) {

View File

@@ -430,7 +430,7 @@ func IsRelatablePairs(p1, p2 currency.Pair, includeUSDT bool) bool {
return true
}
var relatablePairs = GetRelatableCurrencies(p1, true, includeUSDT)
relatablePairs := GetRelatableCurrencies(p1, true, includeUSDT)
if p1.IsCryptoFiatPair() {
for x := range relatablePairs {
relatablePairs = append(relatablePairs,

View File

@@ -89,7 +89,8 @@ func CreateTestBot(tb testing.TB) *Engine {
Pairs: pairs2,
},
},
}}}
}},
}
err := bot.LoadExchange(testExchange)
assert.NoError(tb, err, "LoadExchange should not error")
@@ -193,12 +194,14 @@ func TestSetSubsystem(t *testing.T) { //nolint // TO-DO: Fix race t.Parallel() u
Subsystem: grpcName,
Engine: &Engine{Config: &config.Config{}},
EnableError: errGRPCManagementFault,
DisableError: errGRPCManagementFault},
DisableError: errGRPCManagementFault,
},
{
Subsystem: grpcProxyName,
Engine: &Engine{Config: &config.Config{}},
EnableError: errGRPCManagementFault,
DisableError: errGRPCManagementFault},
DisableError: errGRPCManagementFault,
},
{
Subsystem: dataHistoryManagerName,
Engine: &Engine{Config: &config.Config{}},
@@ -677,7 +680,7 @@ func TestMapCurrenciesByExchange(t *testing.T) {
t.Parallel()
e := CreateTestBot(t)
var pairs = []currency.Pair{
pairs := []currency.Pair{
currency.NewPair(currency.BTC, currency.USD),
currency.NewPair(currency.BTC, currency.EUR),
}

View File

@@ -1193,7 +1193,8 @@ func TestGetFuturesPositionsForExchange(t *testing.T) {
Pair: cp,
Side: order.Buy,
Amount: 1,
Price: 1})
Price: 1,
})
if !errors.Is(err, nil) {
t.Errorf("received '%v', expected '%v'", err, nil)
}
@@ -1240,7 +1241,8 @@ func TestClearFuturesPositionsForExchange(t *testing.T) {
Pair: cp,
Side: order.Buy,
Amount: 1,
Price: 1})
Price: 1,
})
if !errors.Is(err, nil) {
t.Errorf("received '%v', expected '%v'", err, nil)
}
@@ -1291,7 +1293,8 @@ func TestUpdateOpenPositionUnrealisedPNL(t *testing.T) {
Pair: cp,
Side: order.Buy,
Amount: 1,
Price: 1})
Price: 1,
})
if !errors.Is(err, nil) {
t.Errorf("received '%v', expected '%v'", err, nil)
}

View File

@@ -18,10 +18,8 @@ import (
// PortfolioManagerName is an exported subsystem name
const PortfolioManagerName = "portfolio"
var (
// PortfolioSleepDelay defines the default sleep time between portfolio manager runs
PortfolioSleepDelay = time.Minute
)
// PortfolioSleepDelay defines the default sleep time between portfolio manager runs
var PortfolioSleepDelay = time.Minute
// portfolioManager routinely retrieves a user's holdings through exchange APIs as well
// as through addresses provided in the config

View File

@@ -486,7 +486,8 @@ func RPCTestSetup(t *testing.T) *Engine {
Enabled: currency.Pairs{cp},
AssetEnabled: true,
ConfigFormat: &currency.PairFormat{Uppercase: true},
RequestFormat: &currency.PairFormat{Uppercase: true}}
RequestFormat: &currency.PairFormat{Uppercase: true},
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -505,7 +506,8 @@ func RPCTestSetup(t *testing.T) *Engine {
Enabled: currency.Pairs{cp},
AssetEnabled: true,
ConfigFormat: &currency.PairFormat{Uppercase: true},
RequestFormat: &currency.PairFormat{Uppercase: true}}
RequestFormat: &currency.PairFormat{Uppercase: true},
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -1343,7 +1345,8 @@ func TestGetOrders(t *testing.T) {
Enabled: currency.Pairs{cp},
AssetEnabled: true,
ConfigFormat: &currency.PairFormat{Uppercase: true},
RequestFormat: &currency.PairFormat{Uppercase: true}}
RequestFormat: &currency.PairFormat{Uppercase: true},
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -1453,7 +1456,8 @@ func TestGetOrder(t *testing.T) {
Enabled: currency.Pairs{cp},
AssetEnabled: true,
ConfigFormat: &currency.PairFormat{Uppercase: true},
RequestFormat: &currency.PairFormat{Uppercase: true}}
RequestFormat: &currency.PairFormat{Uppercase: true},
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -1565,7 +1569,7 @@ func TestCheckVars(t *testing.T) {
err = checkParams("Binance", e, asset.Spot, currency.NewPair(currency.BTC, currency.USDT))
assert.ErrorIs(t, err, errCurrencyPairInvalid, "checkParams should error correctly")
var data = []currency.Pair{
data := []currency.Pair{
{Delimiter: currency.DashDelimiter, Base: currency.BTC, Quote: currency.USDT},
}
@@ -1584,7 +1588,7 @@ func TestCheckVars(t *testing.T) {
func TestParseEvents(t *testing.T) {
t.Parallel()
var exchangeName = "Binance"
exchangeName := "Binance"
testData := make([]*withdraw.Response, 5)
for x := range 5 {
test := fmt.Sprintf("test-%v", x)
@@ -1659,7 +1663,8 @@ func TestRPCServerUpsertDataHistoryJob(t *testing.T) {
b.CurrencyPairs.Pairs[asset.Spot] = &currency.PairStore{
Available: currency.Pairs{cp},
Enabled: currency.Pairs{cp},
AssetEnabled: true}
AssetEnabled: true,
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -1931,7 +1936,8 @@ func TestGetManagedOrders(t *testing.T) {
Enabled: currency.Pairs{cp},
AssetEnabled: true,
ConfigFormat: &currency.PairFormat{Uppercase: true},
RequestFormat: &currency.PairFormat{Uppercase: true}}
RequestFormat: &currency.PairFormat{Uppercase: true},
}
err = em.Add(exch)
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
@@ -2161,7 +2167,8 @@ func TestCurrencyStateWithdraw(t *testing.T) {
Engine: &Engine{},
}).CurrencyStateWithdraw(context.Background(),
&gctrpc.CurrencyStateWithdrawRequest{
Exchange: "wow", Asset: "meow"})
Exchange: "wow", Asset: "meow",
})
if !errors.Is(err, asset.ErrNotSupported) {
t.Fatalf("received: %v, but expected: %v", err, asset.ErrNotSupported)
}
@@ -2170,7 +2177,8 @@ func TestCurrencyStateWithdraw(t *testing.T) {
Engine: &Engine{},
}).CurrencyStateWithdraw(context.Background(),
&gctrpc.CurrencyStateWithdrawRequest{
Exchange: "wow", Asset: "spot"})
Exchange: "wow", Asset: "spot",
})
if !errors.Is(err, ErrSubSystemNotStarted) {
t.Fatalf("received: %v, but expected: %v", err, ErrSubSystemNotStarted)
}
@@ -2244,8 +2252,10 @@ func TestCurrencyStateTradingPair(t *testing.T) {
if !errors.Is(err, nil) {
t.Fatalf("received: '%v' but expected: '%v'", err, nil)
}
s := RPCServer{Engine: &Engine{ExchangeManager: em,
currencyStateManager: &CurrencyStateManager{started: 1, iExchangeManager: em}}}
s := RPCServer{Engine: &Engine{
ExchangeManager: em,
currencyStateManager: &CurrencyStateManager{started: 1, iExchangeManager: em},
}}
_, err = s.CurrencyStateTradingPair(context.Background(),
&gctrpc.CurrencyStateTradingPairRequest{

View File

@@ -266,6 +266,7 @@ func newCurrencyPairSyncAgent(k key.ExchangePairAsset) *currencyPairSyncAgent {
trackers: make([]*syncBase, SyncItemTrade+1),
}
}
func (m *SyncManager) add(k key.ExchangePairAsset, s syncBase) *currencyPairSyncAgent {
m.mux.Lock()
defer m.mux.Unlock()

View File

@@ -122,7 +122,7 @@ func TestWebsocketRoutineManagerStop(t *testing.T) {
}
func TestWebsocketRoutineManagerHandleData(t *testing.T) {
var exchName = "Bitstamp"
exchName := "Bitstamp"
var wg sync.WaitGroup
em := NewExchangeManager()
exch, err := em.NewExchangeByName(exchName)
@@ -154,7 +154,7 @@ func TestWebsocketRoutineManagerHandleData(t *testing.T) {
if !errors.Is(err, nil) {
t.Errorf("error '%v', expected '%v'", err, nil)
}
var orderID = "1337"
orderID := "1337"
err = m.websocketDataHandler(exchName, errors.New("error"))
if err == nil {
t.Error("Error not handled correctly")
@@ -225,7 +225,8 @@ func TestWebsocketRoutineManagerHandleData(t *testing.T) {
}
err = m.websocketDataHandler(exchName, stream.UnhandledMessageWarning{
Message: "there's an issue here's a tissue"},
Message: "there's an issue here's a tissue",
},
)
if err != nil {
t.Error(err)

View File

@@ -4,10 +4,8 @@ import (
"errors"
)
var (
// ErrWithdrawRequestNotFound message to display when no record is found
ErrWithdrawRequestNotFound = errors.New("request not found")
)
// ErrWithdrawRequestNotFound message to display when no record is found
var ErrWithdrawRequestNotFound = errors.New("request not found")
// WithdrawManager is responsible for performing withdrawal requests and
// saving them to the database