From 3878c96803fc1120741935311968945a6ba816f1 Mon Sep 17 00:00:00 2001
From: Ana Julia <anajuliabit@gmail.com>
Date: Wed, 24 Jul 2024 09:36:30 -0300
Subject: [PATCH] uses BaseStaking for Staking.sol

---
 src/DelegateStaking.sol | 4 +---
 src/Staking.sol         | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/DelegateStaking.sol b/src/DelegateStaking.sol
index 7dce618..fbca4c6 100644
--- a/src/DelegateStaking.sol
+++ b/src/DelegateStaking.sol
@@ -16,7 +16,7 @@ interface IStaking {
 
 /// @notice Shutter Delegate Staking Contract
 ///         Allows users to stake SHU and earn rewards in exchange.
-contract DelegateStaking is ERC20VotesUpgradeable, OwnableUpgradeable {
+contract DelegateStaking is BaseStaking {
     /*//////////////////////////////////////////////////////////////
                                LIBRARIES
     //////////////////////////////////////////////////////////////*/
@@ -24,8 +24,6 @@ contract DelegateStaking is ERC20VotesUpgradeable, OwnableUpgradeable {
 
     using SafeTransferLib for IERC20;
 
-    using FixedPointMathLib for uint256;
-
     /*//////////////////////////////////////////////////////////////
                                  VARIABLES
     //////////////////////////////////////////////////////////////*/
diff --git a/src/Staking.sol b/src/Staking.sol
index 585517b..e4eaacc 100644
--- a/src/Staking.sol
+++ b/src/Staking.sol
@@ -4,11 +4,11 @@ pragma solidity 0.8.26;
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {ERC20VotesUpgradeable} from "@openzeppelin-upgradeable/contracts/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
 
-import {IERC20} from "./interfaces/IERC20.sol";
+import {BaseStaking} from "./BaseStaking.sol";
 import {SafeTransferLib} from "./libraries/SafeTransferLib.sol";
 import {FixedPointMathLib} from "./libraries/FixedPointMathLib.sol";
+import {IERC20} from "./interfaces/IERC20.sol";
 import {IRewardsDistributor} from "./interfaces/IRewardsDistributor.sol";
-import {BaseStaking} from "./BaseStaking.sol";
 
 /// @notice Shutter Staking Contract
 ///         Allows keypers to stake SHU for a lock period and earn rewards in exchange