From 5a873fb0b971b35537cfd1181818b54836a17ab2 Mon Sep 17 00:00:00 2001 From: Daniel Grimes Date: Fri, 6 Sep 2024 19:57:02 +0100 Subject: [PATCH] tidy formatting --- .../V3/Entities/TradeTests.cs | 200 ++++++++++-------- 1 file changed, 107 insertions(+), 93 deletions(-) diff --git a/test/Uniswap.Sdk.Testing/V3/Entities/TradeTests.cs b/test/Uniswap.Sdk.Testing/V3/Entities/TradeTests.cs index 5926b20..f72e2fe 100644 --- a/test/Uniswap.Sdk.Testing/V3/Entities/TradeTests.cs +++ b/test/Uniswap.Sdk.Testing/V3/Entities/TradeTests.cs @@ -235,10 +235,11 @@ await Trade.FromRoutes( public void CreateUncheckedTrade_ThrowsIfInputCurrencyDoesNotMatchRoute() { Assert.Throws(() => - Trade.CreateUncheckedTrade( new RouteInput(){ - Route = new Route([pool_0_1], token0, token1), - InputAmount = CurrencyAmount.FromRawAmount(token2, 10000), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 10000) + Trade.CreateUncheckedTrade(new RouteInput + { + Route = new Route([pool_0_1], token0, token1), + InputAmount = CurrencyAmount.FromRawAmount(token2, 10000), + OutputAmount = CurrencyAmount.FromRawAmount(token1, 10000) }, TradeType.EXACT_INPUT ) @@ -250,7 +251,8 @@ public void CreateUncheckedTrade_ThrowsIfOutputCurrencyDoesNotMatchRoute() { Assert.Throws(() => Trade.CreateUncheckedTrade - (new RouteInput(){ + (new RouteInput + { Route = new Route([pool_0_1], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 10000), OutputAmount = CurrencyAmount.FromRawAmount(token2, 10000) @@ -264,7 +266,8 @@ public void CreateUncheckedTrade_ThrowsIfOutputCurrencyDoesNotMatchRoute() public void CreateUncheckedTrade_CanCreateAnExactInputTradeWithoutSimulating() { Trade.CreateUncheckedTrade( - new RouteInput(){ + new RouteInput + { Route = new Route([pool_0_1], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 10000), OutputAmount = CurrencyAmount.FromRawAmount(token1, 100000) @@ -277,10 +280,12 @@ public void CreateUncheckedTrade_CanCreateAnExactInputTradeWithoutSimulating() public void CreateUncheckedTrade_CanCreateAnExactOutputTradeWithoutSimulating() { Trade.CreateUncheckedTrade( - new RouteInput(){ + new RouteInput + { Route = new Route([pool_0_1], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 10000), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 100000)} + OutputAmount = CurrencyAmount.FromRawAmount(token1, 100000) + } , TradeType.EXACT_OUTPUT ); @@ -338,41 +343,41 @@ public void CreateUncheckedTradeWithMultipleRoutes_ThrowsIfOutputCurrencyDoesNot [Fact] public void CreateUncheckedTradeWithMultipleRoutes_CanCreateAnExactInputTradeWithoutSimulatingWithMultipleRoutes() { - Trade.CreateUncheckedTradeWithMultipleRoutes([ - new RouteInput + Trade.CreateUncheckedTradeWithMultipleRoutes([ + new RouteInput { - Route = new Route([pool_0_1], token0, token1), + Route = new Route([pool_0_1], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 5000), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000), + OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000) }, - new RouteInput + new RouteInput { - Route = new Route([pool_0_2, pool_1_2], token0, token1), + Route = new Route([pool_0_2, pool_1_2], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 5000), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000), + OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000) } - ], - TradeType.EXACT_INPUT); + ], + TradeType.EXACT_INPUT); } [Fact] public void CreateUncheckedTradeWithMultipleRoutes_CanCreateAnExactOutputTradeWithoutSimulatingWithMultipleRoutes() { Trade.CreateUncheckedTradeWithMultipleRoutes([ - new RouteInput + new RouteInput { - Route = new Route([pool_0_1], token0, token1), + Route = new Route([pool_0_1], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 5001), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000), + OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000) }, - new RouteInput + new RouteInput { - Route = new Route([pool_0_2, pool_1_2], token0, token1), + Route = new Route([pool_0_2, pool_1_2], token0, token1), InputAmount = CurrencyAmount.FromRawAmount(token0, 4999), - OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000), + OutputAmount = CurrencyAmount.FromRawAmount(token1, 50000) } ], - TradeType.EXACT_OUTPUT + TradeType.EXACT_OUTPUT ); } @@ -381,10 +386,12 @@ public void CreateUncheckedTradeWithMultipleRoutes_CanCreateAnExactOutputTradeWi public void RouteAndSwaps() { var singleRoute = Trade.CreateUncheckedTrade( - new RouteInput(){ - Route=new Route([pool_0_1, pool_1_2], token0, token2), - InputAmount = CurrencyAmount.FromRawAmount(token0, 100), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 69)}, + new RouteInput + { + Route = new Route([pool_0_1, pool_1_2], token0, token2), + InputAmount = CurrencyAmount.FromRawAmount(token0, 100), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 69) + }, TradeType.EXACT_INPUT ); @@ -421,30 +428,28 @@ public void RouteAndSwaps() public void WorstExecutionPrice() { // Test for EXACT_INPUT - var exactIn = Trade.CreateUncheckedTrade(new RouteInput() + var exactIn = Trade.CreateUncheckedTrade(new RouteInput { Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 100), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 69), - + OutputAmount = CurrencyAmount.FromRawAmount(token2, 69) }, TradeType.EXACT_INPUT); var exactInMultiRoute = Trade.CreateUncheckedTradeWithMultipleRoutes( - [ - new RouteInput - { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), - InputAmount = CurrencyAmount.FromRawAmount(token0, 50), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 35), - }, - new RouteInput - { - Route = new Route(new List { pool_0_2 }, token0, token2), - InputAmount = CurrencyAmount.FromRawAmount(token0, 50), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 34), - } - ], - TradeType.EXACT_INPUT); + [ + new RouteInput + { + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + InputAmount = CurrencyAmount.FromRawAmount(token0, 50), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 35) + }, + new RouteInput + { + Route = new Route(new List { pool_0_2 }, token0, token2), + InputAmount = CurrencyAmount.FromRawAmount(token0, 50), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 34) + } + ], TradeType.EXACT_INPUT); Assert.Throws(() => exactIn.MinimumAmountOut(new Percent(-1, 100))); Assert.Equal(exactIn.ExecutionPrice, exactIn.WorstExecutionPrice(new Percent(0, 100))); @@ -457,30 +462,30 @@ public void WorstExecutionPrice() Assert.Equal(new Price(token0, token2, 100, 23), exactInMultiRoute.WorstExecutionPrice(new Percent(200, 100))); // Test for EXACT_OUTPUT - var exactOut = Trade.CreateUncheckedTrade(new RouteInput() + var exactOut = Trade.CreateUncheckedTrade(new RouteInput { Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 156), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 100), - - }, TradeType.EXACT_OUTPUT); + OutputAmount = CurrencyAmount.FromRawAmount(token2, 100) + }, TradeType.EXACT_OUTPUT); var exactOutMultiRoute = Trade.CreateUncheckedTradeWithMultipleRoutes( - - [ new RouteInput + [ + new RouteInput { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 78), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 50), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 50) }, new RouteInput { - Route = new Route(new List { pool_0_2 }, token0, token2), + Route = new Route(new List { pool_0_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 78), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 50), - }] + OutputAmount = CurrencyAmount.FromRawAmount(token2, 50) + } + ] , - TradeType.EXACT_OUTPUT + TradeType.EXACT_OUTPUT ); Assert.Throws(() => exactOut.WorstExecutionPrice(new Percent(-1, 100))); @@ -499,32 +504,34 @@ public void PriceImpact() { // Test for EXACT_INPUT var exactIn = Trade.CreateUncheckedTradeWithMultipleRoutes( - [ - new RouteInput + [ + new RouteInput { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 100), OutputAmount = CurrencyAmount.FromRawAmount(token2, 69) - } -], - TradeType.EXACT_INPUT + } + ], + TradeType.EXACT_INPUT ); var exactInMultipleRoutes = Trade.CreateUncheckedTradeWithMultipleRoutes( - [ new RouteInput + [ + new RouteInput { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 90), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 62), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 62) }, - new RouteInput + new RouteInput { - Route = new Route(new List { pool_0_2 }, token0, token2), + Route = new Route(new List { pool_0_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 10), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 7), - }] + OutputAmount = CurrencyAmount.FromRawAmount(token2, 7) + } + ] , - TradeType.EXACT_INPUT + TradeType.EXACT_INPUT ); Assert.Equal("17.2", exactIn.PriceImpact.ToSignificant(3)); @@ -532,32 +539,35 @@ public void PriceImpact() // Test for EXACT_OUTPUT var exactOut = Trade.CreateUncheckedTradeWithMultipleRoutes( - - [ new RouteInput + [ + new RouteInput { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 156), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 100), - }] - , - TradeType.EXACT_OUTPUT + OutputAmount = CurrencyAmount.FromRawAmount(token2, 100) + } + ] + , + TradeType.EXACT_OUTPUT ); var exactOutMultipleRoutes = Trade.CreateUncheckedTradeWithMultipleRoutes( -[ new RouteInput + [ + new RouteInput { - Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), + Route = new Route(new List { pool_0_1, pool_1_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 140), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 90), + OutputAmount = CurrencyAmount.FromRawAmount(token2, 90) }, - new RouteInput + new RouteInput { - Route = new Route(new List { pool_0_2 }, token0, token2), + Route = new Route(new List { pool_0_2 }, token0, token2), InputAmount = CurrencyAmount.FromRawAmount(token0, 16), - OutputAmount = CurrencyAmount.FromRawAmount(token2, 10), - }] - , - TradeType.EXACT_OUTPUT + OutputAmount = CurrencyAmount.FromRawAmount(token2, 10) + } + ] + , + TradeType.EXACT_OUTPUT ); Assert.Equal("23.1", exactOut.PriceImpact.ToSignificant(3)); @@ -606,9 +616,10 @@ public async Task BestTradeExactIn_ProvidesBestRoute() [Fact] public async Task BestTradeExactIn_RespectsMaxHops() { - var result = await Trade.BestTradeExactIn([pool_0_1, pool_0_2, pool_1_2], CurrencyAmount.FromRawAmount(token0, 10), token2, new Trade.BestTradeOptions() { MaxHops = 1 }); + var result = await Trade.BestTradeExactIn([pool_0_1, pool_0_2, pool_1_2], CurrencyAmount.FromRawAmount(token0, 10), token2, + new Trade.BestTradeOptions { MaxHops = 1 }); Assert.Single(result); - Assert.Single( result[0].Swaps[0].Route.Pools); + Assert.Single(result[0].Swaps[0].Route.Pools); Assert.Equal([token0, token2], result[0].Swaps[0].Route.TokenPath); } @@ -626,7 +637,8 @@ public async Task BestTradeExactIn_InsufficientInputForOnePool() [Fact] public async Task BestTradeExactIn_RespectsN() { - var result = await Trade.BestTradeExactIn([pool_0_1, pool_0_2, pool_1_2], CurrencyAmount.FromRawAmount(token0, 10), token2, new Trade.BestTradeOptions() { MaxHops = 1 }); + var result = await Trade.BestTradeExactIn([pool_0_1, pool_0_2, pool_1_2], CurrencyAmount.FromRawAmount(token0, 10), token2, + new Trade.BestTradeOptions { MaxHops = 1 }); Assert.Single(result); } @@ -806,7 +818,8 @@ public async Task BestTradeExactOut_ProvidesBestRoute() [Fact] public async Task BestTradeExactOut_RespectsMaxHops() { - var result = await Trade.BestTradeExactOut([pool_0_1, pool_0_2, pool_1_2], token0, CurrencyAmount.FromRawAmount(token2, 10), new Trade.BestTradeOptions() {MaxHops= 1}); + var result = await Trade.BestTradeExactOut([pool_0_1, pool_0_2, pool_1_2], token0, CurrencyAmount.FromRawAmount(token2, 10), + new Trade.BestTradeOptions { MaxHops = 1 }); Assert.Single(result); Assert.Single(result[0].Swaps[0].Route.Pools); Assert.Equal([token0, token2], result[0].Swaps[0].Route.TokenPath); @@ -815,7 +828,8 @@ public async Task BestTradeExactOut_RespectsMaxHops() [Fact] public async Task BestTradeExactOut_RespectsN() { - var result = await Trade.BestTradeExactOut([pool_0_1, pool_0_2, pool_1_2], token0, CurrencyAmount.FromRawAmount(token2, 10), new Trade.BestTradeOptions() { MaxHops = 1 }); + var result = await Trade.BestTradeExactOut([pool_0_1, pool_0_2, pool_1_2], token0, CurrencyAmount.FromRawAmount(token2, 10), + new Trade.BestTradeOptions { MaxHops = 1 }); Assert.Single(result); }