Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions client/swaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ type ListSwapHistoryParams struct {
Limit int64
// Offset defines the number of swaps to skip.
Offset int64
// Status defines the swap status filter (optional).
Status types.UiStatus
// Network defines the swap network filter (optional).
Network int64
// From defines the swap `from` timestamp filter (optional).
Expand All @@ -40,6 +38,8 @@ type ListSwapHistoryParams struct {
Token string
// Wallets specify addresses filter.
Wallets []string
// Statuses specify statusses filter.
Statuses []types.CombinedStatus
// RetailID specifies the retail ID filter.
RetailID string
}
Expand All @@ -55,10 +55,6 @@ func (params *ListSwapHistoryParams) toQueryParams() string {
q.Set("offset", strconv.FormatInt(params.Offset, 10))
}

if params.Status != "" {
q.Set("status", string(params.Status))
}

if params.Network != 0 {
q.Set("network", strconv.FormatInt(params.Network, 10))
}
Expand All @@ -83,6 +79,10 @@ func (params *ListSwapHistoryParams) toQueryParams() string {
q.Set("retail_id", params.RetailID)
}

for _, status := range params.Statuses {
q.Add("status", status.String())
}

return q.Encode()
}

Expand Down
2 changes: 1 addition & 1 deletion examples/get-history/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func main() {
RetailID: cfg.RetailID,
Limit: cfg.Limit,
Offset: cfg.Offset,
Status: types.UiStatusSubmitted,
Statuses: []types.CombinedStatus{types.CombinedStatusAccepted},
Network: cfg.NetworkID,
From: time.Now().UnixMilli() - OneDayInMs,
To: time.Now().UnixMilli() + OneDayInMs,
Expand Down
4 changes: 4 additions & 0 deletions types/intents.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ const (
// CombinedStatusRefunded defines the `Refunded` status.
CombinedStatusRefunded CombinedStatus = "Refunded"
)

func (s CombinedStatus) String() string {
return string(s)
}
20 changes: 0 additions & 20 deletions types/swaps.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,3 @@ type SwapAdditionalInfo struct {
MinDestAmountLots *Int `json:"min_dest_amount_lots"`
MaxDestAmountLots *Int `json:"max_dest_amount_lots"`
}

// UiStatus represents a human-readable status of a swap.
type UiStatus string

const (
// UiStatusSubmitted defines the `Submitted` status.
UiStatusSubmitted UiStatus = "Submitted"
// UiStatusFailed defines the `Failed` status.
UiStatusFailed UiStatus = "Failed"
// UiStatusExecuting defines the `Executing` status.
UiStatusExecuting UiStatus = "Executing"
// UiStatusCompleted defines the `Completed` status.
UiStatusCompleted UiStatus = "Completed"
// UiStatusRefunding defines the `Refunding` status.
UiStatusRefunding UiStatus = "Refunding"
// UiStatusRefunded defines the `Refunded` status.
UiStatusRefunded UiStatus = "Refunded"
// UiStatusExpired defines the `Expired` status.
UiStatusExpired UiStatus = "Expired"
)
Loading