mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-08 07:26:48 +00:00
Deribit: Add subscription configuration (#1636)
* Kline: Fix Raw Short, Marshal and Unmarshal * Deribit: Rename GenerateDefaultSubs * Deribit: Remove custom GetDefaultConfig Moved to exchange base by #1472 * Deribit: Straight Rename of eps to endpoints Since I had to ask what this abbreviation meant, I think we should abandon it * Deribit: Add Subscription configuration * Deribit: Fix race on Setup with optionsRegex Calling Setup twice would race on the assignment to this package var. There was an option to just move the assignment to the package var declaration, but this change improves the performance and allocations: ``` BenchmarkOptionPairToString-8 1000000 1239 ns/op 485 B/op 10 allocs/op BenchmarkOptionPairToString2-8 3473804 656.2 ns/op 348 B/op 7 allocs/op ``` I've also removed the t.Run because even success the -v output from tests would be very noisy, and I don't think we were getting any benefit from it at all: ``` === RUN TestOptionPairToString === PAUSE TestOptionPairToString === CONT TestOptionPairToString === RUN TestOptionPairToString/BTC-30MAY24-61000-C === PAUSE TestOptionPairToString/BTC-30MAY24-61000-C === RUN TestOptionPairToString/ETH-1JUN24-3200-P === PAUSE TestOptionPairToString/ETH-1JUN24-3200-P === RUN TestOptionPairToString/SOL_USDC-31MAY24-162-P === PAUSE TestOptionPairToString/SOL_USDC-31MAY24-162-P === RUN TestOptionPairToString/MATIC_USDC-6APR24-0d98-P === PAUSE TestOptionPairToString/MATIC_USDC-6APR24-0d98-P === CONT TestOptionPairToString/BTC-30MAY24-61000-C === CONT TestOptionPairToString/SOL_USDC-31MAY24-162-P === CONT TestOptionPairToString/ETH-1JUN24-3200-P === CONT TestOptionPairToString/MATIC_USDC-6APR24-0d98-P --- PASS: TestOptionPairToString (0.00s) --- PASS: TestOptionPairToString/BTC-30MAY24-61000-C (0.00s) --- PASS: TestOptionPairToString/ETH-1JUN24-3200-P (0.00s) --- PASS: TestOptionPairToString/SOL_USDC-31MAY24-162-P (0.00s) --- PASS: TestOptionPairToString/MATIC_USDC-6APR24-0d98-P (0.00s) ``` ( And that got worse with me adding more tests )
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -28,12 +27,6 @@ type Deribit struct {
|
||||
exchange.Base
|
||||
}
|
||||
|
||||
var (
|
||||
// optionRegex compiles optionDecimalRegex at startup and is used to help set
|
||||
// option currency lower-case d eg MATIC-USDC-3JUN24-0d64-P
|
||||
optionRegex *regexp.Regexp
|
||||
)
|
||||
|
||||
const (
|
||||
deribitAPIVersion = "/api/v2"
|
||||
tradeBaseURL = "https://www.deribit.com/"
|
||||
@@ -43,8 +36,7 @@ const (
|
||||
tradeFuturesCombo = "futures-spreads/"
|
||||
tradeOptionsCombo = "combos/"
|
||||
|
||||
perpString = "PERPETUAL"
|
||||
optionDecimalRegex = `\d+(D)\d+`
|
||||
perpString = "PERPETUAL"
|
||||
|
||||
// Public endpoints
|
||||
// Market Data
|
||||
@@ -2837,20 +2829,19 @@ func (d *Deribit) formatFuturesTradablePair(pair currency.Pair) string {
|
||||
return instrumentID
|
||||
}
|
||||
|
||||
// optionPairToString to format and return an Options currency pairs with the following format: MATIC_USDC-6APR24-0d98-P
|
||||
// it has both uppercase or lowercase characters, which we can not achieve with the Upper=true or Upper=false
|
||||
// optionPairToString formats an options pair as: SYMBOL-EXPIRE-STRIKE-TYPE
|
||||
// SYMBOL may be a currency (BTC) or a pair (XRP_USDC)
|
||||
// EXPIRE is DDMMMYY
|
||||
// STRIKE may include a d for decimal point in linear options
|
||||
// TYPE is Call or Put
|
||||
func (d *Deribit) optionPairToString(pair currency.Pair) string {
|
||||
subCodes := strings.Split(pair.Quote.String(), currency.DashDelimiter)
|
||||
initialDelimiter := currency.DashDelimiter
|
||||
if subCodes[0] == "USDC" {
|
||||
q := pair.Quote.String()
|
||||
if strings.HasPrefix(q, "USDC") && len(q) > 11 { // Linear option
|
||||
initialDelimiter = currency.UnderscoreDelimiter
|
||||
// Replace a capital D with d for decimal place in Strike price
|
||||
// Char 11 is either the hyphen before Strike price or first digit
|
||||
q = q[:11] + strings.Replace(q[11:], "D", "d", -1)
|
||||
}
|
||||
for i := range subCodes {
|
||||
if match := optionRegex.MatchString(subCodes[i]); match {
|
||||
subCodes[i] = strings.ToLower(subCodes[i])
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return pair.Base.String() + initialDelimiter + strings.Join(subCodes, currency.DashDelimiter)
|
||||
return pair.Base.String() + initialDelimiter + q
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user