mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-05-13 15:09:42 +00:00
Websocket: Restructure files and types (#1859)
* Websocket: Rename stream package * Websocket: Rename Websocket to Manager * Websocket: Replace explicit errs with common.NilGuard * Websocket: Move websocket_types.go to types.go * Websocket: Minor field comment and alignment in types * Webosocket: Rename WebsocketConnection to Connection * Alphapoint: Make gorilla ws import explicit Just to avoid confusion with our own packages. * Websocket: Move stream_match to match * Websocket: Move websocket_connection to connection * Websocket: Move websocket.go to manager.go * Websocket: Break out all subscription methods into subscriptions.go * Websocket: Move connection type into its file * Websocket: Remove PositionUpdated Type is not used anywhere * Kraken: Use local constant for pong Was the only use of websocket.Pong and doesn't really feel right to represent kraken's api resp in one of our packages * Websocket: Move connection sub-types to connection package * Websocket: Move manager types into manager * Websocket: Move ConnectionWrapper into manager * Websocket: Move websocket_test to manager_test * Websocket: Privatise connectionWrapper * Websocket: Remaining types into types.go These really belong somewhere else mostly, but this will do for now * Websocket: Tidy up connection method vars * Gofumpt: Moving package imports around * Websocket: Rename errDuplicateConnectionSetup * Websocket: Fix duplicate import of gws * Websocket: Fix gofumpt -extra * Websocket: Standardise import of gws across other pkgs * Kraken: Remove unused sub conf consts These were replaced by the generic Levels and Depth fields on all subs * Websocket: Privitise ConnectioWrapper fields * Websocket: inline single use var WebsocketNotAuthenticatedUsingRest * Websocket: Move documentation to template * Bithumb: Assertify TestWsHandleData
This commit is contained in:
@@ -12,8 +12,8 @@ import (
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/order"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/stream"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
|
||||
"github.com/thrasher-corp/gocryptotrader/internal/exchange/websocket"
|
||||
)
|
||||
|
||||
func TestWebsocketRoutineManagerSetup(t *testing.T) {
|
||||
@@ -159,7 +159,7 @@ func TestWebsocketRoutineManagerHandleData(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Error("Error not handled correctly")
|
||||
}
|
||||
err = m.websocketDataHandler(exchName, stream.FundingData{})
|
||||
err = m.websocketDataHandler(exchName, websocket.FundingData{})
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
@@ -171,7 +171,7 @@ func TestWebsocketRoutineManagerHandleData(t *testing.T) {
|
||||
if !errors.Is(err, nil) {
|
||||
t.Errorf("error '%v', expected '%v'", err, nil)
|
||||
}
|
||||
err = m.websocketDataHandler(exchName, stream.KlineData{})
|
||||
err = m.websocketDataHandler(exchName, websocket.KlineData{})
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
@@ -224,10 +224,9 @@ func TestWebsocketRoutineManagerHandleData(t *testing.T) {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
err = m.websocketDataHandler(exchName, stream.UnhandledMessageWarning{
|
||||
err = m.websocketDataHandler(exchName, websocket.UnhandledMessageWarning{
|
||||
Message: "there's an issue here's a tissue",
|
||||
},
|
||||
)
|
||||
})
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
@@ -294,7 +293,7 @@ func TestRegisterWebsocketDataHandlerWithFunctionality(t *testing.T) {
|
||||
t.Fatal("unexpected data handlers registered")
|
||||
}
|
||||
|
||||
mock := stream.NewWebsocket()
|
||||
mock := websocket.NewManager()
|
||||
mock.ToRoutine = make(chan any)
|
||||
m.state = readyState
|
||||
err = m.websocketDataReceiver(mock)
|
||||
|
||||
Reference in New Issue
Block a user