Skip to content

Commit a05a00c

Browse files
committed
(fix) Renamed two methods to make the intent more clear
1 parent cc89852 commit a05a00c

File tree

5 files changed

+157
-133
lines changed

5 files changed

+157
-133
lines changed

pyinjective/async_client.py

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,14 +2808,18 @@ async def _initialize_tokens_and_markets(self):
28082808
ticker=market_info["ticker"],
28092809
base_token=base_token,
28102810
quote_token=quote_token,
2811-
maker_fee_rate=Token.convert_value_from_chain_format(Decimal(market_info["makerFeeRate"])),
2812-
taker_fee_rate=Token.convert_value_from_chain_format(Decimal(market_info["takerFeeRate"])),
2813-
service_provider_fee=Token.convert_value_from_chain_format(Decimal(market_info["relayerFeeShareRate"])),
2814-
min_price_tick_size=Token.convert_value_from_chain_format(Decimal(market_info["minPriceTickSize"])),
2815-
min_quantity_tick_size=Token.convert_value_from_chain_format(
2811+
maker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market_info["makerFeeRate"])),
2812+
taker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market_info["takerFeeRate"])),
2813+
service_provider_fee=Token.convert_value_from_extended_decimal_format(
2814+
Decimal(market_info["relayerFeeShareRate"])
2815+
),
2816+
min_price_tick_size=Token.convert_value_from_extended_decimal_format(
2817+
Decimal(market_info["minPriceTickSize"])
2818+
),
2819+
min_quantity_tick_size=Token.convert_value_from_extended_decimal_format(
28162820
Decimal(market_info["minQuantityTickSize"])
28172821
),
2818-
min_notional=Token.convert_value_from_chain_format(Decimal(market_info["minNotional"])),
2822+
min_notional=Token.convert_value_from_extended_decimal_format(Decimal(market_info["minNotional"])),
28192823
)
28202824

28212825
spot_markets[market.id] = market
@@ -2835,17 +2839,25 @@ async def _initialize_tokens_and_markets(self):
28352839
oracle_quote=market["oracleQuote"],
28362840
oracle_type=market["oracleType"],
28372841
oracle_scale_factor=market["oracleScaleFactor"],
2838-
initial_margin_ratio=Token.convert_value_from_chain_format(Decimal(market["initialMarginRatio"])),
2839-
maintenance_margin_ratio=Token.convert_value_from_chain_format(
2842+
initial_margin_ratio=Token.convert_value_from_extended_decimal_format(
2843+
Decimal(market["initialMarginRatio"])
2844+
),
2845+
maintenance_margin_ratio=Token.convert_value_from_extended_decimal_format(
28402846
Decimal(market["maintenanceMarginRatio"])
28412847
),
28422848
quote_token=quote_token,
2843-
maker_fee_rate=Token.convert_value_from_chain_format(Decimal(market["makerFeeRate"])),
2844-
taker_fee_rate=Token.convert_value_from_chain_format(Decimal(market["takerFeeRate"])),
2845-
service_provider_fee=Token.convert_value_from_chain_format(Decimal(market["relayerFeeShareRate"])),
2846-
min_price_tick_size=Token.convert_value_from_chain_format(Decimal(market["minPriceTickSize"])),
2847-
min_quantity_tick_size=Token.convert_value_from_chain_format(Decimal(market["minQuantityTickSize"])),
2848-
min_notional=Token.convert_value_from_chain_format(Decimal(market["minNotional"])),
2849+
maker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market["makerFeeRate"])),
2850+
taker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market["takerFeeRate"])),
2851+
service_provider_fee=Token.convert_value_from_extended_decimal_format(
2852+
Decimal(market["relayerFeeShareRate"])
2853+
),
2854+
min_price_tick_size=Token.convert_value_from_extended_decimal_format(
2855+
Decimal(market["minPriceTickSize"])
2856+
),
2857+
min_quantity_tick_size=Token.convert_value_from_extended_decimal_format(
2858+
Decimal(market["minQuantityTickSize"])
2859+
),
2860+
min_notional=Token.convert_value_from_extended_decimal_format(Decimal(market["minNotional"])),
28492861
)
28502862

28512863
derivative_markets[derivative_market.id] = derivative_market
@@ -2865,17 +2877,21 @@ async def _initialize_tokens_and_markets(self):
28652877
expiration_timestamp=market_info["expirationTimestamp"],
28662878
settlement_timestamp=market_info["settlementTimestamp"],
28672879
quote_token=quote_token,
2868-
maker_fee_rate=Token.convert_value_from_chain_format(Decimal(market_info["makerFeeRate"])),
2869-
taker_fee_rate=Token.convert_value_from_chain_format(Decimal(market_info["takerFeeRate"])),
2870-
service_provider_fee=Token.convert_value_from_chain_format(Decimal(market_info["relayerFeeShareRate"])),
2871-
min_price_tick_size=Token.convert_value_from_chain_format(Decimal(market_info["minPriceTickSize"])),
2872-
min_quantity_tick_size=Token.convert_value_from_chain_format(
2880+
maker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market_info["makerFeeRate"])),
2881+
taker_fee_rate=Token.convert_value_from_extended_decimal_format(Decimal(market_info["takerFeeRate"])),
2882+
service_provider_fee=Token.convert_value_from_extended_decimal_format(
2883+
Decimal(market_info["relayerFeeShareRate"])
2884+
),
2885+
min_price_tick_size=Token.convert_value_from_extended_decimal_format(
2886+
Decimal(market_info["minPriceTickSize"])
2887+
),
2888+
min_quantity_tick_size=Token.convert_value_from_extended_decimal_format(
28732889
Decimal(market_info["minQuantityTickSize"])
28742890
),
2875-
min_notional=Token.convert_value_from_chain_format(Decimal(market_info["minNotional"])),
2891+
min_notional=Token.convert_value_from_extended_decimal_format(Decimal(market_info["minNotional"])),
28762892
settlement_price=None
28772893
if market_info["settlementPrice"] == ""
2878-
else Token.convert_value_from_chain_format(Decimal(market_info["settlementPrice"])),
2894+
else Token.convert_value_from_extended_decimal_format(Decimal(market_info["settlementPrice"])),
28792895
)
28802896

28812897
binary_option_markets[market.id] = market

0 commit comments

Comments
 (0)