From 484bb1c1bb64d9dc0fad3258761c01f8a8714e82 Mon Sep 17 00:00:00 2001 From: ilya Date: Fri, 5 Jan 2024 15:09:50 +0000 Subject: [PATCH] Enums camel case (#9) Must be released and tested together with https://github.com/cowprotocol/services/pull/2171 --- openapi.yml | 14 +++++++------- src/api/routes/solve/dto/auction.rs | 8 ++++---- src/api/routes/solve/dto/solution.rs | 14 +++++++------- src/domain/solver/dex/mod.rs | 3 ++- src/infra/dex/balancer/dto.rs | 2 +- src/tests/balancer/market_order.rs | 4 ++-- src/tests/dex/partial_fill.rs | 6 +++--- src/tests/oneinch/market_order.rs | 2 +- src/tests/paraswap/market_order.rs | 4 ++-- src/tests/zeroex/market_order.rs | 4 ++-- src/tests/zeroex/options.rs | 2 +- 11 files changed, 32 insertions(+), 31 deletions(-) diff --git a/openapi.yml b/openapi.yml index e6ea5a8..a040aac 100644 --- a/openapi.yml +++ b/openapi.yml @@ -245,7 +245,7 @@ components: properties: kind: type: string - enum: [constantproduct] + enum: [constantProduct] tokens: description: | A mapping of token address to its reserve amounts. @@ -266,7 +266,7 @@ components: properties: kind: type: string - enum: [weightedproduct] + enum: [weightedProduct] tokens: description: | A mapping of token address to its reserve amounts with weights. @@ -286,7 +286,7 @@ components: $ref: "#/components/schemas/Decimal" version: type: string - enum: ["v0", "v3plus"] + enum: ["v0", "v3Plus"] StablePool: description: | @@ -334,7 +334,7 @@ components: properties: kind: type: string - enum: [concentratedliquidity] + enum: [concentratedLiquidity] tokens: type: array items: @@ -350,7 +350,7 @@ components: A map of tick indices to their liquidity values. type: object additionalProperties: - $ref: "#/components/schemas/TokenAmount" + $ref: "#/components/schemas/BigInt" fee: $ref: "#/components/schemas/Decimal" @@ -369,7 +369,7 @@ components: properties: kind: type: string - enum: [limitorder] + enum: [limitOrder] hash: $ref: "#/components/schemas/Digest" makerToken: @@ -735,7 +735,7 @@ components: properties: kind: type: string - enum: [riskadjusted] + enum: [riskAdjusted] successProbability: description: | The revert probability of the solution. Used by the driver to compute a risk-adjusted score. diff --git a/src/api/routes/solve/dto/auction.rs b/src/api/routes/solve/dto/auction.rs index 1c3f005..a523a99 100644 --- a/src/api/routes/solve/dto/auction.rs +++ b/src/api/routes/solve/dto/auction.rs @@ -117,14 +117,14 @@ struct Order { } #[derive(Debug, Deserialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum Kind { Sell, Buy, } #[derive(Debug, Deserialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum Class { Market, Limit, @@ -146,7 +146,7 @@ struct Token { #[allow(clippy::enum_variant_names)] #[derive(Debug, Deserialize)] -#[serde(tag = "kind", rename_all = "lowercase", deny_unknown_fields)] +#[serde(tag = "kind", rename_all = "camelCase", deny_unknown_fields)] enum Liquidity { ConstantProduct(ConstantProductPool), WeightedProduct(WeightedProductPool), @@ -227,7 +227,7 @@ struct WeightedProductReserve { } #[derive(Debug, Deserialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum WeightedProductVersion { V0, V3Plus, diff --git a/src/api/routes/solve/dto/solution.rs b/src/api/routes/solve/dto/solution.rs index cc8fd0c..5026d7d 100644 --- a/src/api/routes/solve/dto/solution.rs +++ b/src/api/routes/solve/dto/solution.rs @@ -153,7 +153,7 @@ struct Solution { } #[derive(Debug, Serialize)] -#[serde(tag = "kind", rename_all = "lowercase")] +#[serde(tag = "kind", rename_all = "camelCase")] enum Trade { Fulfillment(Fulfillment), Jit(JitTrade), @@ -207,14 +207,14 @@ struct JitOrder { } #[derive(Debug, Serialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum Kind { Sell, Buy, } #[derive(Debug, Serialize)] -#[serde(tag = "kind", rename_all = "lowercase")] +#[serde(tag = "kind", rename_all = "camelCase")] enum Interaction { Liquidity(LiquidityInteraction), Custom(CustomInteraction), @@ -284,7 +284,7 @@ struct Allowance { } #[derive(Debug, Default, Serialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum SellTokenBalance { #[default] Erc20, @@ -293,7 +293,7 @@ enum SellTokenBalance { } #[derive(Debug, Default, Serialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum BuyTokenBalance { #[default] Erc20, @@ -301,7 +301,7 @@ enum BuyTokenBalance { } #[derive(Debug, Serialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] enum SigningScheme { Eip712, EthSign, @@ -312,7 +312,7 @@ enum SigningScheme { /// A score for a solution. The score is used to rank solutions. #[serde_as] #[derive(Debug, Serialize)] -#[serde(rename_all = "lowercase", tag = "kind")] +#[serde(rename_all = "camelCase", tag = "kind")] pub enum Score { Solver { #[serde_as(as = "serialize::U256")] diff --git a/src/domain/solver/dex/mod.rs b/src/domain/solver/dex/mod.rs index 276f3bc..9021df9 100644 --- a/src/domain/solver/dex/mod.rs +++ b/src/domain/solver/dex/mod.rs @@ -5,7 +5,8 @@ use { crate::{ boundary::rate_limiter::{RateLimiter, RateLimiterError}, domain::{ - self, auction, + self, + auction, dex::{self, slippage}, order::{self, Order}, solution, diff --git a/src/infra/dex/balancer/dto.rs b/src/infra/dex/balancer/dto.rs index a3be557..39a3f87 100644 --- a/src/infra/dex/balancer/dto.rs +++ b/src/infra/dex/balancer/dto.rs @@ -9,7 +9,7 @@ use { }; #[derive(Debug, Serialize)] -#[serde(rename_all = "lowercase")] +#[serde(rename_all = "camelCase")] pub enum OrderKind { Sell, Buy, diff --git a/src/tests/balancer/market_order.rs b/src/tests/balancer/market_order.rs index 3c7d9fc..3bd2548 100644 --- a/src/tests/balancer/market_order.rs +++ b/src/tests/balancer/market_order.rs @@ -156,7 +156,7 @@ async fn sell() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] @@ -314,7 +314,7 @@ async fn buy() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] diff --git a/src/tests/dex/partial_fill.rs b/src/tests/dex/partial_fill.rs index e054545..7952488 100644 --- a/src/tests/dex/partial_fill.rs +++ b/src/tests/dex/partial_fill.rs @@ -246,7 +246,7 @@ endpoint = 'http://{}/sor' } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] @@ -581,7 +581,7 @@ endpoint = 'http://{}/sor' } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] @@ -849,7 +849,7 @@ async fn market() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] diff --git a/src/tests/oneinch/market_order.rs b/src/tests/oneinch/market_order.rs index 4ae117a..2c32281 100644 --- a/src/tests/oneinch/market_order.rs +++ b/src/tests/oneinch/market_order.rs @@ -207,7 +207,7 @@ async fn sell() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } } diff --git a/src/tests/paraswap/market_order.rs b/src/tests/paraswap/market_order.rs index 8d8a522..13b6b19 100644 --- a/src/tests/paraswap/market_order.rs +++ b/src/tests/paraswap/market_order.rs @@ -236,7 +236,7 @@ async fn sell() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } } @@ -491,7 +491,7 @@ async fn buy() { } ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } } diff --git a/src/tests/zeroex/market_order.rs b/src/tests/zeroex/market_order.rs index 9b3605f..31523f5 100644 --- a/src/tests/zeroex/market_order.rs +++ b/src/tests/zeroex/market_order.rs @@ -187,7 +187,7 @@ async fn sell() { }, ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] @@ -369,7 +369,7 @@ async fn buy() { }, ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }] diff --git a/src/tests/zeroex/options.rs b/src/tests/zeroex/options.rs index 7ef5928..685cf29 100644 --- a/src/tests/zeroex/options.rs +++ b/src/tests/zeroex/options.rs @@ -294,7 +294,7 @@ enable-slippage-protection = true }, ], "score": { - "kind": "riskadjusted", + "kind": "riskAdjusted", "successProbability": 0.5, } }]