Merge pull request #585 from livepeer/revert-584-rl/remove-duplicate-…

…ibondingmanager-interface Revert "bonding: remove duplicate IBondingManager interface"
livepeer · May 25, 2022 · d1e2222 · d1e2222
2 parents 58c1e20 + f5facdf
commit d1e2222
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/contracts/bonding/BondingManager.sol b/contracts/bonding/BondingManager.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.9;
 
 import "../ManagerProxyTarget.sol";
-import "../interfaces/IBondingManager.sol";
+import "./IBondingManager.sol";
 import "../libraries/SortedDoublyLL.sol";
 import "../libraries/MathUtils.sol";
 import "../libraries/PreciseMathUtils.sol";

diff --git a/contracts/interfaces/IBondingManager.sol → contracts/bonding/IBondingManager.sol b/contracts/interfaces/IBondingManager.sol → contracts/bonding/IBondingManager.sol
@@ -78,6 +78,4 @@ interface IBondingManager {
     function isActiveTranscoder(address _transcoder) external view returns (bool);
 
     function getTotalBonded() external view returns (uint256);
-
-    function pendingStake(address _addr, uint256 _endRound) external view returns (uint256);
 }
diff --git a/contracts/pm/mixins/interfaces/MContractRegistry.sol b/contracts/pm/mixins/interfaces/MContractRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.9;
 
-import "../../../interfaces/IBondingManager.sol";
+import "../../../bonding/IBondingManager.sol";
 import "../../../token/IMinter.sol";
 import "../../../rounds/IRoundsManager.sol";
 

diff --git a/contracts/polling/PollCreator.sol b/contracts/polling/PollCreator.sol
@@ -2,7 +2,12 @@
 pragma solidity 0.8.9;
 
 import "./Poll.sol";
-import "../interfaces/IBondingManager.sol";
+
+interface IBondingManager {
+    function transcoderTotalStake(address _addr) external view returns (uint256);
+
+    function pendingStake(address _addr, uint256 _endRound) external view returns (uint256);
+}
 
 contract PollCreator {
     // 33.33%

diff --git a/contracts/rounds/RoundsManager.sol b/contracts/rounds/RoundsManager.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.9;
 
 import "../ManagerProxyTarget.sol";
 import "./IRoundsManager.sol";
-import "../interfaces/IBondingManager.sol";
+import "../bonding/IBondingManager.sol";
 import "../token/IMinter.sol";
 import "../libraries/MathUtils.sol";
 

diff --git a/contracts/token/Minter.sol b/contracts/token/Minter.sol
@@ -5,7 +5,7 @@ import "../Manager.sol";
 import "./IMinter.sol";
 import "./ILivepeerToken.sol";
 import "../rounds/IRoundsManager.sol";
-import "../interfaces/IBondingManager.sol";
+import "../bonding/IBondingManager.sol";
 import "../libraries/MathUtilsV2.sol";
 
 import "@openzeppelin/contracts/utils/math/SafeMath.sol";

diff --git a/test/unit/PollCreator.js b/test/unit/PollCreator.js
@@ -25,7 +25,7 @@ describe("PollCreator", () => {
         fixture = new Fixture(web3)
 
         bondingManagerMock = await smock.fake(
-            "contracts/interfaces/IBondingManager.sol:IBondingManager",
+            "contracts/polling/PollCreator.sol:IBondingManager",
             {
                 address: mockBondingManagerEOA.address
             }