From f5276e1b219851fab6ff665e7cec063de489d18c Mon Sep 17 00:00:00 2001
From: CodeNinja04 <hemendrasharma2019@gmail.com>
Date: Fri, 4 Mar 2022 22:15:44 +0530
Subject: [PATCH] claim and supply function updated

---
 .../polygon/connectors/fluidity/events.sol    | 37 ++++++++---
 .../polygon/connectors/fluidity/interface.sol |  2 -
 .../polygon/connectors/fluidity/main.sol      | 63 +++++++++----------
 3 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/contracts/polygon/connectors/fluidity/events.sol b/contracts/polygon/connectors/fluidity/events.sol
index 0141ac52..c49b21ad 100644
--- a/contracts/polygon/connectors/fluidity/events.sol
+++ b/contracts/polygon/connectors/fluidity/events.sol
@@ -1,16 +1,35 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.6;
 
-
 contract Events {
+	event LogSupply(
+		address indexed token_,
+		uint256 amount_,
+		uint256 itokenAmount_,
+		uint256 getId,
+		uint256 setId
+	);
 
-event LogSupply(address indexed token_, uint256 amount_,uint256 itokenAmount_,uint256 getId,uint256 setId);
+	event LogWithdraw(
+		address indexed token_,
+		uint256 amt_,
+		uint256 itokenAmount_,
+		uint256 getId,
+		uint256 setId
+	);
 
-event LogWithdraw(address indexed token_, uint256 amt_,uint256 itokenAmount_,uint256 getId,uint256 setId);
+	event LogWithdrawItoken(
+		address indexed token_,
+		uint256 amt_,
+		uint256 amount_,
+		uint256 getId,
+		uint256 setId
+	);
 
-event LogWithdrawItoken(address indexed token_, uint256 amt_,uint256 amount_,uint256 getId,uint256 setId);
-
-event LogClaimReward(address indexed user_ , address  indexed token_ , uint256[] updatedRewards_,uint256[] setId);
-
-
-}
\ No newline at end of file
+	event LogClaimReward(
+		address indexed user_,
+		address indexed token_,
+		uint256[] updatedRewards_,
+		uint256[] setId
+	);
+}
diff --git a/contracts/polygon/connectors/fluidity/interface.sol b/contracts/polygon/connectors/fluidity/interface.sol
index 75eb8713..ff532521 100644
--- a/contracts/polygon/connectors/fluidity/interface.sol
+++ b/contracts/polygon/connectors/fluidity/interface.sol
@@ -17,6 +17,4 @@ interface IProtocolModule {
 	function claim(address user_, address token_)
 		external
 		returns (uint256[] memory updatedRewards_);
-
-
 }
diff --git a/contracts/polygon/connectors/fluidity/main.sol b/contracts/polygon/connectors/fluidity/main.sol
index 8a83a5ff..926e2858 100644
--- a/contracts/polygon/connectors/fluidity/main.sol
+++ b/contracts/polygon/connectors/fluidity/main.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 /**
  * @title Fluidity.
- * @dev 
+ * @dev
  */
 
 import { Events } from "./events.sol";
@@ -12,15 +12,14 @@ import { Helpers } from "./helper.sol";
 import { TokenInterface } from "../../common/interfaces.sol";
 
 abstract contract FluidityResolver is Events, Helpers {
-
-	 /**
-     * @dev 
-     * @notice 
-     * @param token_ Token Address.
-     * @param amt Token Amount.
-     * @param getId ID to retrieve amt
-     * @param setId ID stores the amount of tokens supplied
-     */
+	/**
+	 * @dev
+	 * @notice
+	 * @param token_ Token Address.
+	 * @param amt Token Amount.
+	 * @param getId ID to retrieve amt
+	 * @param setId ID stores the amount of tokens supplied
+	 */
 	function supply(
 		address token_,
 		uint256 amt,
@@ -49,14 +48,14 @@ abstract contract FluidityResolver is Events, Helpers {
 		);
 	}
 
- /**
-     * @dev 
-     * @notice 
-     * @param token_ Token Address.
-     * @param amtount Token Amount.
-     * @param getId ID to retrieve amt
-     * @param setId ID stores the amount of tokens withdrawn
-     */
+	/**
+	 * @dev
+	 * @notice
+	 * @param token_ Token Address.
+	 * @param amtount Token Amount.
+	 * @param getId ID to retrieve amt
+	 * @param setId ID stores the amount of tokens withdrawn
+	 */
 	function withdraw(
 		address token_,
 		uint256 amount_,
@@ -79,14 +78,14 @@ abstract contract FluidityResolver is Events, Helpers {
 		);
 	}
 
- 	/**
-     * @dev 
-     * @notice 
-     * @param token_ Token Address.
-     * @param itokenAmtount iToken Amount.
-     * @param getId ID to retrieve amt
-     * @param setId ID stores the amount of itokens withdrawn
-     */
+	/**
+	 * @dev
+	 * @notice
+	 * @param token_ Token Address.
+	 * @param itokenAmtount iToken Amount.
+	 * @param getId ID to retrieve amt
+	 * @param setId ID stores the amount of itokens withdrawn
+	 */
 
 	function withdrawItoken(
 		address token_,
@@ -105,12 +104,12 @@ abstract contract FluidityResolver is Events, Helpers {
 	}
 
 	/**
-     * @dev 
-     * @notice 
-     * @param user_  User Address.
-     * @param token_ Token Address.
-     * @param setId Array of setId stores the amount of claimed Rewards
-     */
+	 * @dev
+	 * @notice
+	 * @param user_  User Address.
+	 * @param token_ Token Address.
+	 * @param setId Array of setId stores the amount of claimed Rewards
+	 */
 	function claim(
 		address user_,
 		address token_,