Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: remove String method on metadata; remove pointer to tc.BotEvent #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terwey merged 1 commit into from
Oct 21, 2025
Merged

fix: remove String method on metadata; remove pointer to tc.BotEvent #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion emitter/emitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func (e *HyperLiquidEmitter) setMarketPrice(ctx context.Context, order hyperliqu
}

func (e *HyperLiquidEmitter) Emit(ctx context.Context, w recomma.OrderWork) error {
logger := e.logger.With("md", w.MD.String()).With("bot-event", w.BotEvent)
logger := e.logger.With("md", w.MD.Hex()).With("bot-event", w.BotEvent)
logger.Debug("emit", slog.Any("orderwork", w))
if err := e.waitTurn(ctx); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/sonirico/go-hyperliquid v0.16.1
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1
github.com/terwey/3commas-sdk-go v0.0.1
github.com/terwey/3commas-sdk-go v0.0.2
golang.org/x/sync v0.17.0
k8s.io/client-go v0.34.0
modernc.org/sqlite v1.39.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ github.com/supranational/blst v0.3.16 h1:bTDadT+3fK497EvLdWRQEjiGnUtzJ7jjIUMF0jq
github.com/supranational/blst v0.3.16/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
github.com/terwey/3commas-sdk-go v0.0.1 h1:FCZBysJ5Yq6li10CIT5wuSVFTnKBAxiUTIPs8IiNe1w=
github.com/terwey/3commas-sdk-go v0.0.1/go.mod h1:R6WkKWr7REsAh49F3eQX7b1QasBVWxDzwG1T3JIW5T0=
github.com/terwey/3commas-sdk-go v0.0.2 h1:0PU/n3VZPP6/pqkiG5Vwgsp/t+ebZ1H85F0jEHcadvo=
github.com/terwey/3commas-sdk-go v0.0.2/go.mod h1:R6WkKWr7REsAh49F3eQX7b1QasBVWxDzwG1T3JIW5T0=
github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
Expand Down
2 changes: 1 addition & 1 deletion internal/api/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func (h *ApiHandler) orderRecordFromItem(ctx context.Context, row OrderItem, inc
BotId: int64(row.Metadata.BotID),
DealId: int64(row.Metadata.DealID),
BotEventId: int64(row.Metadata.BotEventID),
CreatedAt: *row.BotEvent.CreatedAt,
CreatedAt: row.BotEvent.CreatedAt,
ObservedAt: row.ObservedAt,
BotEventPayload: eventPayload,
LatestSubmission: latestSubmission,
Expand Down
6 changes: 2 additions & 4 deletions internal/testutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func NewBotEvent(t *testing.T, base time.Time, botID uint32,
t.Helper()

evt := tc.BotEvent{
CreatedAt: ptr(base.UTC()),
CreatedAt: base.UTC(),
Action: tc.BotEventActionPlace,
Coin: "BTC",
Type: tc.MarketOrderOrderType(tc.BUY),
Expand Down Expand Up @@ -59,10 +59,8 @@ func WithAction(action tc.BotEventAction) EventOpt {
return func(e *tc.BotEvent) { e.Action = action }
}
func WithCreatedAt(ts time.Time) EventOpt {
return func(e *tc.BotEvent) { e.CreatedAt = ptr(ts.UTC()) }
return func(e *tc.BotEvent) { e.CreatedAt = ts.UTC() }
}
func WithMarket(isMarket bool) EventOpt {
return func(e *tc.BotEvent) { e.IsMarket = isMarket }
}

func ptr(t time.Time) *time.Time { return &t }
4 changes: 0 additions & 4 deletions metadata/md.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ type Metadata struct {
BotEventID uint32
}

func (md *Metadata) String() string {
return md.Hex()
}

func (md *Metadata) HexAsPointer() *string {
hex := md.Hex()
return &hex
Expand Down
6 changes: 3 additions & 3 deletions storage/latestHlSafetyStatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestStorageListLatestHyperliquidSafetyStatuses(t *testing.T) {

normalizeMetadata := func(t *testing.T, md metadata.Metadata) metadata.Metadata {
t.Helper()
normalized, err := metadata.FromHexString(md.String())
normalized, err := metadata.FromHexString(md.Hex())
require.NoError(t, err)
return *normalized
}
Expand All @@ -33,7 +33,7 @@ func TestStorageListLatestHyperliquidSafetyStatuses(t *testing.T) {
t.Helper()

botevent := tc.BotEvent{
CreatedAt: &created,
CreatedAt: created,
Action: tc.BotEventActionExecute,
Coin: coin,
Type: tc.BUY,
Expand Down Expand Up @@ -299,7 +299,7 @@ func TestStorageListLatestHyperliquidSafetyStatuses(t *testing.T) {
}
created := base
takeProfit := tc.BotEvent{
CreatedAt: &created,
CreatedAt: created,
Action: tc.BotEventActionExecute,
Coin: coin,
Type: tc.BUY,
Expand Down
19 changes: 7 additions & 12 deletions storage/sqlite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestStorageThreeCommasRoundTrip(t *testing.T) {
BotEventID: 3,
},
botevent: tc.BotEvent{
CreatedAt: &base,
CreatedAt: base,
Action: tc.BotEventActionExecute,
Coin: "DOGE",
Type: tc.MarketOrderOrderType(tc.BUY),
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestStorageThreeCommasRoundTrip(t *testing.T) {
BotEventID: 222,
},
botevent: tc.BotEvent{
CreatedAt: &base,
CreatedAt: base,
Action: tc.BotEventActionExecute,
Coin: "DOGE",
Type: tc.MarketOrderOrderType(tc.BUY),
Expand Down Expand Up @@ -760,11 +760,6 @@ func TestStorageThreeCommasDealUpsert(t *testing.T) {
func TestStorageListEventsForOrder(t *testing.T) {
store := newTestStorage(t)

ptrTime := func(t time.Time) *time.Time {
v := t
return &v
}

base := time.Date(2024, time.July, 18, 14, 30, 0, 0, time.UTC)
botID := uint32(501)
dealID := uint32(1601)
Expand All @@ -777,7 +772,7 @@ func TestStorageListEventsForOrder(t *testing.T) {
DealID: dealID,
BotEventID: botEventID,
}, tc.BotEvent{
CreatedAt: ptrTime(ts),
CreatedAt: ts,
Action: tc.BotEventActionExecute,
Coin: "DOGE",
Type: tc.MarketOrderOrderType(tc.BUY),
Expand Down Expand Up @@ -825,7 +820,7 @@ func TestStorageListEventsForOrder(t *testing.T) {
BotEventID: botEventID,
}
otherEvt := tc.BotEvent{
CreatedAt: ptrTime(base),
CreatedAt: base,
Action: tc.BotEventActionExecute,
Coin: "DOGE",
}
Expand Down Expand Up @@ -856,7 +851,7 @@ func TestRecordThreeCommasBotEventDuplicateReturnsPreviousInsertID(t *testing.T)
BotEventID: 789,
}
event := tc.BotEvent{
CreatedAt: &base,
CreatedAt: base,
Action: tc.BotEventActionPlace,
Coin: "DOGE",
Type: tc.BUY,
Expand Down Expand Up @@ -901,7 +896,7 @@ func TestLoadTakeProfitForDeal(t *testing.T) {
BotEventID: 987,
}
evt := tc.BotEvent{
CreatedAt: &base,
CreatedAt: base,
Action: tc.BotEventActionExecute,
Coin: "ETH",
OrderType: tc.MarketOrderDealOrderTypeTakeProfit,
Expand All @@ -926,6 +921,6 @@ func TestLoadTakeProfitForDeal(t *testing.T) {
require.Equal(t, evt.Action, gotEvent.Action)
require.Equal(t, tc.MarketOrderDealOrderTypeTakeProfit, gotEvent.OrderType)
require.NotNil(t, gotEvent.CreatedAt)
require.WithinDuration(t, base, *gotEvent.CreatedAt, 0)
require.WithinDuration(t, base, gotEvent.CreatedAt, 0)
})
}
27 changes: 11 additions & 16 deletions storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (s *Storage) RecordThreeCommasBotEvent(md metadata.Metadata, order tc.BotEv

ctx := context.Background()
params := sqlcgen.InsertThreeCommasBotEventParams{
Md: md.String(),
Md: md.Hex(),
BotID: int64(md.BotID),
DealID: int64(md.DealID),
BoteventID: int64(md.BotEventID),
Expand Down Expand Up @@ -113,7 +113,7 @@ func (s *Storage) RecordThreeCommasBotEventLog(md metadata.Metadata, order tc.Bo

ctx := context.Background()
params := sqlcgen.InsertThreeCommasBotEventLogParams{
Md: md.String(),
Md: md.Hex(),
BotID: int64(md.BotID),
DealID: int64(md.DealID),
BoteventID: int64(md.BotEventID),
Expand Down Expand Up @@ -163,7 +163,7 @@ func (s *Storage) HasMetadata(md metadata.Metadata) (bool, error) {
defer s.mu.Unlock()

ctx := context.Background()
exists, err := s.queries.HasThreeCommasMetadata(ctx, md.String())
exists, err := s.queries.HasThreeCommasMetadata(ctx, md.Hex())
if err != nil {
return false, err
}
Expand All @@ -176,7 +176,7 @@ func (s *Storage) LoadThreeCommasBotEvent(md metadata.Metadata) (*tc.BotEvent, e
defer s.mu.Unlock()

ctx := context.Background()
payload, err := s.queries.FetchThreeCommasBotEvent(ctx, md.String())
payload, err := s.queries.FetchThreeCommasBotEvent(ctx, md.Hex())
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
Expand All @@ -203,7 +203,7 @@ func (s *Storage) RecordHyperliquidOrderRequest(md metadata.Metadata, req hyperl

ctx := context.Background()
params := sqlcgen.UpsertHyperliquidCreateParams{
Md: md.String(),
Md: md.Hex(),
CreatePayload: raw,
BoteventRowID: boteventRowId,
}
Expand All @@ -222,7 +222,7 @@ func (s *Storage) AppendHyperliquidModify(md metadata.Metadata, req hyperliquid.

ctx := context.Background()
params := sqlcgen.AppendHyperliquidModifyParams{
Md: md.String(),
Md: md.Hex(),
ModifyPayload: raw,
BoteventRowID: boteventRowId,
}
Expand All @@ -241,7 +241,7 @@ func (s *Storage) RecordHyperliquidCancel(md metadata.Metadata, req hyperliquid.

ctx := context.Background()
params := sqlcgen.UpsertHyperliquidCancelParams{
Md: md.String(),
Md: md.Hex(),
CancelPayload: raw,
BoteventRowID: boteventRowId,
}
Expand All @@ -260,7 +260,7 @@ func (s *Storage) RecordHyperliquidStatus(md metadata.Metadata, status hyperliqu

ctx := context.Background()
params := sqlcgen.InsertHyperliquidStatusParams{
Md: md.String(),
Md: md.Hex(),
Status: raw,
RecordedAtUtc: time.Now().UTC().UnixMilli(),
}
Expand All @@ -269,7 +269,7 @@ func (s *Storage) RecordHyperliquidStatus(md metadata.Metadata, status hyperliqu
}

func (s *Storage) loadLatestHyperliquidStatusLocked(ctx context.Context, md metadata.Metadata) (*hyperliquid.WsOrder, bool, error) {
payload, err := s.queries.FetchLatestHyperliquidStatus(ctx, md.String())
payload, err := s.queries.FetchLatestHyperliquidStatus(ctx, md.Hex())
if errors.Is(err, sql.ErrNoRows) {
return nil, false, nil
}
Expand All @@ -290,7 +290,7 @@ func (s *Storage) ListHyperliquidStatuses(md metadata.Metadata) ([]hyperliquid.W
defer s.mu.Unlock()

ctx := context.Background()
rows, err := s.queries.ListHyperliquidStatuses(ctx, md.String())
rows, err := s.queries.ListHyperliquidStatuses(ctx, md.Hex())
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -402,7 +402,7 @@ func (s *Storage) LoadHyperliquidSubmission(md metadata.Metadata) (recomma.Actio
defer s.mu.Unlock()

ctx := context.Background()
row, err := s.queries.FetchHyperliquidSubmission(ctx, md.String())
row, err := s.queries.FetchHyperliquidSubmission(ctx, md.Hex())
if errors.Is(err, sql.ErrNoRows) {
return recomma.Action{}, false, nil
}
Expand Down Expand Up @@ -592,11 +592,6 @@ func (s *Storage) LoadTakeProfitForDeal(dealID uint32) (*metadata.Metadata, *tc.
if err := json.Unmarshal(row.Payload, &evt); err != nil {
return nil, nil, fmt.Errorf("decode take profit bot event: %w", err)
}
// backfill CreatedAt from the DB if the payload didn’t include it
if evt.CreatedAt == nil && row.CreatedAtUtc != 0 {
ts := time.UnixMilli(row.CreatedAtUtc).UTC()
evt.CreatedAt = &ts
}

return md, &evt, nil
}