Jun 25, 2021
diff --git a/tests/test_uniswap.py b/tests/test_uniswap.py
            balance_after = client.get_token_balance(output_token)
            if output_token != self.eth:
                assert balance_before + qty == balance_after

    @pytest.mark.parametrize(
        "input_token, output_token, route, expectation",
        [
            (dai, weth, [dai, weth], does_not_raise),
            (weth, dai, [weth, dai], does_not_raise),
            (usdc, dai, [usdc, weth, dai], does_not_raise),
            (weth, eth, [], lambda: pytest.raises(ValueError)),
            (eth, weth, [], lambda: pytest.raises(ValueError)),
        ],
    )
    def test_get_v2_trade_route(
        self,
        input_token,
        output_token,
        route,
        expectation,
        client
    ):
        if client.version == 1:
            pytest.skip(
                "Not supported in this version of Uniswap, or at least no liquidity"
            )
        with expectation():
            res = client._get_v2_trade_route(input_token, output_token)

            assert res == route
diff --git a/uniswap/uniswap.py b/uniswap/uniswap.py
                elif is_same_address(token1, self.get_weth_address()):
                    return int(self._get_token_eth_output_price(token0, Wei(qty), fee))

                route =[token0,self.get_weth_address(), token1]
                route = self._get_v2_trade_route(token0, token1)
                logger.warning(f"No route specified, assuming route: {route}")

        if self.version == 2:
                    input_token, output_token, qty, fee=fee
                )
            )
            route = self._get_v2_trade_route(input_token, output_token)
            return self._build_and_send_tx(
                self.router.functions.swapExactTokensForTokens(
                    qty,
                    min_tokens_bought,
 [input_token, self.get_weth_address(), output_token],
 route,
                    recipient,
                    self._deadline(),
                ),
        else:
            raise ValueError

    def _get_v2_trade_route(
        self, input_token: AddressLike, output_token: AddressLike
    ) -> List[AddressLike]:
        """Gets trade route simply through WETH.

        Deals with two special cases when trading directly with WETH.
        """
        weth = self.get_weth_address()
        if {weth, ETH_ADDRESS} == {input_token, output_token}:
            raise ValueError("Swapping between ETH and WETH not supported!")
        if input_token == weth:
            return [weth, output_token]
        elif output_token == weth:
            return [input_token, weth]
        return [input_token, weth, output_token]

    def _eth_to_token_swap_output(
        self,
        output_token: AddressLike,
                self.router.functions.swapTokensForExactTokens(
                    qty,
                    amount_in_max,
 [input_token,self.get_weth_address(), output_token],
                    self._get_v2_trade_route(input_token, output_token),
                    recipient,
                    self._deadline(),
                ),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -330,3 +330,30 @@ def test_make_trade_output(
		balance_after = client.get_token_balance(output_token)
		if output_token != self.eth:
		assert balance_before + qty == balance_after

		@pytest.mark.parametrize(
		"input_token, output_token, route, expectation",
		[
		(dai, weth, [dai, weth], does_not_raise),
		(weth, dai, [weth, dai], does_not_raise),
		(usdc, dai, [usdc, weth, dai], does_not_raise),
		(weth, eth, [], lambda: pytest.raises(ValueError)),
		(eth, weth, [], lambda: pytest.raises(ValueError)),
		],
		)
		def test_get_v2_trade_route(
		self,
		input_token,
		output_token,
		route,
		expectation,
		client
		):
		if client.version == 1:
		pytest.skip(
		"Not supported in this version of Uniswap, or at least no liquidity"
		)
		with expectation():
		res = client._get_v2_trade_route(input_token, output_token)

		assert res == route
Original file line number	Diff line number	Diff line change
Expand Up		@@ -330,7 +330,7 @@ def _get_token_token_output_price(
		elif is_same_address(token1, self.get_weth_address()):
		return int(self._get_token_eth_output_price(token0, Wei(qty), fee))

		route =[token0,self.get_weth_address(), token1]
		route = self._get_v2_trade_route(token0, token1)
		logger.warning(f"No route specified, assuming route: {route}")

		if self.version == 2:
Expand DownExpand Up		@@ -558,11 +558,12 @@ def _token_to_token_swap_input(
		input_token, output_token, qty, fee=fee
		)
		)
		route = self._get_v2_trade_route(input_token, output_token)
		return self._build_and_send_tx(
		self.router.functions.swapExactTokensForTokens(
		qty,
		min_tokens_bought,
		[input_token, self.get_weth_address(), output_token],
		route,
		recipient,
		self._deadline(),
		),
Expand DownExpand Up		@@ -595,6 +596,22 @@ def _token_to_token_swap_input(
		else:
		raise ValueError

		def _get_v2_trade_route(
		self, input_token: AddressLike, output_token: AddressLike
		) -> List[AddressLike]:
		"""Gets trade route simply through WETH.

		Deals with two special cases when trading directly with WETH.
		"""
		weth = self.get_weth_address()
		if {weth, ETH_ADDRESS} == {input_token, output_token}:
		raise ValueError("Swapping between ETH and WETH not supported!")
		if input_token == weth:
		return [weth, output_token]
		elif output_token == weth:
		return [input_token, weth]
		return [input_token, weth, output_token]

		def _eth_to_token_swap_output(
		self,
		output_token: AddressLike,
Expand DownExpand Up		@@ -736,7 +753,7 @@ def _token_to_token_swap_output(
		self.router.functions.swapTokensForExactTokens(
		qty,
		amount_in_max,
		[input_token,self.get_weth_address(), output_token],
		self._get_v2_trade_route(input_token, output_token),
		recipient,
		self._deadline(),
		),
Expand Down