d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-07 23:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

engine/sync_manager: Rename Update to WebsocketUpdate (#1300)

Browse Source 
* sync_manager: Update replaced with WebsocketUpdate

* sync_manager: replaced TestSyncManagerUpdate with TestSyncManagerWebsocketUpdate

* Update engine/sync_manager.go

---------

Co-authored-by: Adrian Gallagher <adrian.gallagher@thrasher.io>
This commit is contained in:
Bea
2023-08-07 13:40:09 +07:00
committed by GitHub
parent 4200447118
commit 067fae0e00
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/subsystem_types.go
View File

@@ -77,7 +77,7 @@ type iCurrencyPairSyncer interface {
IsRunning() bool IsRunning() bool
PrintTickerSummary(*ticker.Price, string, error) PrintTickerSummary(*ticker.Price, string, error)
PrintOrderbookSummary(*orderbook.Base, string, error) PrintOrderbookSummary(*orderbook.Base, string, error)
Update(string, currency.Pair, asset.Item, syncItemType, error) error WebsocketUpdate(string, currency.Pair, asset.Item, syncItemType, error) error
} }
// iDatabaseConnectionManager defines a limited scoped databaseConnectionManager // iDatabaseConnectionManager defines a limited scoped databaseConnectionManager

4
engine/sync_manager.go
View File

@@ -330,9 +330,9 @@ func (m *syncManager) add(k currencyPairKey, s syncBase) *currencyPairSyncAgent
return c return c
} }
// Update notifies the syncManager to change the last updated time for a exchange asset pair // WebsocketUpdate notifies the syncManager to change the last updated time for a exchange asset pair
// And set IsUsingWebsocket to true. It should be used externally only from websocket updaters // And set IsUsingWebsocket to true. It should be used externally only from websocket updaters
func (m *syncManager) Update(exchangeName string, p currency.Pair, a asset.Item, syncType syncItemType, err error) error { func (m *syncManager) WebsocketUpdate(exchangeName string, p currency.Pair, a asset.Item, syncType syncItemType, err error) error {
if m == nil { if m == nil {
return fmt.Errorf("exchange CurrencyPairSyncer %w", ErrNilSubsystem) return fmt.Errorf("exchange CurrencyPairSyncer %w", ErrNilSubsystem)
} }

24
engine/sync_manager_test.go
View File

@@ -261,55 +261,55 @@ func TestWaitForInitialSync(t *testing.T) {
} }
} }
func TestSyncManagerUpdate(t *testing.T) { func TestSyncManagerWebsocketUpdate(t *testing.T) {
t.Parallel() t.Parallel()
var m *syncManager var m *syncManager
err := m.Update("", currency.EMPTYPAIR, 1, 47, nil) err := m.WebsocketUpdate("", currency.EMPTYPAIR, 1, 47, nil)
if !errors.Is(err, ErrNilSubsystem) { if !errors.Is(err, ErrNilSubsystem) {
t.Fatalf("received %v, but expected: %v", err, ErrNilSubsystem) t.Fatalf("received %v, but expected: %v", err, ErrNilSubsystem)
} }
m = &syncManager{} m = &syncManager{}
err = m.Update("", currency.EMPTYPAIR, 1, 47, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, 1, 47, nil)
if !errors.Is(err, ErrSubSystemNotStarted) { if !errors.Is(err, ErrSubSystemNotStarted) {
t.Fatalf("received %v, but expected: %v", err, ErrSubSystemNotStarted) t.Fatalf("received %v, but expected: %v", err, ErrSubSystemNotStarted)
} }
m.started = 1 m.started = 1
// not started initial sync // not started initial sync
err = m.Update("", currency.EMPTYPAIR, 1, 47, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, 1, 47, nil)
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
m.initSyncStarted = 1 m.initSyncStarted = 1
// orderbook not enabled // orderbook not enabled
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, nil)
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
m.config.SynchronizeOrderbook = true m.config.SynchronizeOrderbook = true
// ticker not enabled // ticker not enabled
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemTicker, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemTicker, nil)
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
m.config.SynchronizeTicker = true m.config.SynchronizeTicker = true
// trades not enabled // trades not enabled
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemTrade, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemTrade, nil)
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
m.config.SynchronizeTrades = true m.config.SynchronizeTrades = true
err = m.Update("", currency.EMPTYPAIR, asset.Spot, 1336, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, 1336, nil)
if !errors.Is(err, errUnknownSyncItem) { if !errors.Is(err, errUnknownSyncItem) {
t.Fatalf("received %v, but expected: %v", err, errUnknownSyncItem) t.Fatalf("received %v, but expected: %v", err, errUnknownSyncItem)
} }
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, nil) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, nil)
if !errors.Is(err, errCouldNotSyncNewData) { if !errors.Is(err, errCouldNotSyncNewData) {
t.Fatalf("received %v, but expected: %v", err, errCouldNotSyncNewData) t.Fatalf("received %v, but expected: %v", err, errCouldNotSyncNewData)
} }
@@ -320,19 +320,19 @@ func TestSyncManagerUpdate(t *testing.T) {
}, syncBase{}) }, syncBase{})
m.initSyncWG.Add(3) m.initSyncWG.Add(3)
// orderbook match // orderbook match
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, errors.New("test")) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemOrderbook, errors.New("test"))
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
// ticker match // ticker match
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemTicker, errors.New("test")) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemTicker, errors.New("test"))
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }
// trades match // trades match
err = m.Update("", currency.EMPTYPAIR, asset.Spot, SyncItemTrade, errors.New("test")) err = m.WebsocketUpdate("", currency.EMPTYPAIR, asset.Spot, SyncItemTrade, errors.New("test"))
if !errors.Is(err, nil) { if !errors.Is(err, nil) {
t.Fatalf("received %v, but expected: %v", err, nil) t.Fatalf("received %v, but expected: %v", err, nil)
} }

6
engine/websocketroutine_manager.go
View File

@@ -220,7 +220,7 @@ func (m *WebsocketRoutineManager) websocketDataHandler(exchName string, data int
} }
case *ticker.Price: case *ticker.Price:
if m.syncer.IsRunning() { if m.syncer.IsRunning() {
err := m.syncer.Update(exchName, err := m.syncer.WebsocketUpdate(exchName,
d.Pair, d.Pair,
d.AssetType, d.AssetType,
SyncItemTicker, SyncItemTicker,
@@ -237,7 +237,7 @@ func (m *WebsocketRoutineManager) websocketDataHandler(exchName string, data int
case []ticker.Price: case []ticker.Price:
for x := range d { for x := range d {
if m.syncer.IsRunning() { if m.syncer.IsRunning() {
err := m.syncer.Update(exchName, err := m.syncer.WebsocketUpdate(exchName,
d[x].Pair, d[x].Pair,
d[x].AssetType, d[x].AssetType,
SyncItemTicker, SyncItemTicker,
@@ -276,7 +276,7 @@ func (m *WebsocketRoutineManager) websocketDataHandler(exchName string, data int
return err return err
} }
if m.syncer.IsRunning() { if m.syncer.IsRunning() {
err := m.syncer.Update(exchName, err := m.syncer.WebsocketUpdate(exchName,
base.Pair, base.Pair,
base.Asset, base.Asset,
SyncItemOrderbook, SyncItemOrderbook,