Merge pull request #586 from keep-network/rename-deposit-factory-getter

Touchups Small set of renames, removing superfluous require's.
keep-network · Apr 21, 2020 · a5804d5 · a5804d5
2 parents deaa64a + 3d07ece
commit a5804d5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/solidity/contracts/deposit/DepositFunding.sol b/solidity/contracts/deposit/DepositFunding.sol
@@ -63,7 +63,7 @@ library DepositFunding {
         uint256 _bondRequirementSatoshi = _lotSizeSatoshis.mul(_d.tbtcSystem.getInitialCollateralizedPercent()).div(100);
         uint256 _bondRequirementWei = _d.fetchBitcoinPrice().mul(_bondRequirementSatoshi);
 
-        _d.keepSetupFee = _d.tbtcSystem.createNewDepositFeeEstimate();
+        _d.keepSetupFee = _d.tbtcSystem.getNewDepositFeeEstimate();
         /* solium-disable-next-line value-in-payable */
         _d.keepAddress = _d.tbtcSystem.requestNewKeep.value(msg.value)(
             _m,
@@ -165,8 +165,7 @@ library DepositFunding {
             "Signer fraud during funding flow only available while awaiting funding"
         );
 
-        bool _isFraud = _d.submitSignatureFraud(_v, _r, _s, _signedDigest, _preimage);
-        require(_isFraud, "Signature is not fraudulent");
+        _d.submitSignatureFraud(_v, _r, _s, _signedDigest, _preimage);
         _d.logFraudDuringSetup();
 
         // Allow deposit owner to withdraw seized bonds after contract termination.

diff --git a/solidity/contracts/deposit/DepositLiquidation.sol b/solidity/contracts/deposit/DepositLiquidation.sol
@@ -124,7 +124,7 @@ library DepositLiquidation {
             "Signer liquidation already in progress"
         );
         require(!_d.inEndState(), "Contract has halted");
-        require(submitSignatureFraud(_d, _v, _r, _s, _signedDigest, _preimage), "Signature is not fraud");
+        submitSignatureFraud(_d, _v, _r, _s, _signedDigest, _preimage);
         startSignerFraudLiquidation(_d);
     }
 

diff --git a/solidity/contracts/interfaces/ITBTCSystem.sol b/solidity/contracts/interfaces/ITBTCSystem.sol
@@ -14,7 +14,7 @@ interface ITBTCSystem {
     // passthrough requests for the oracle
     function fetchRelayCurrentDifficulty() external view returns (uint256);
     function fetchRelayPreviousDifficulty() external view returns (uint256);
-    function createNewDepositFeeEstimate() external view returns (uint256);
+    function getNewDepositFeeEstimate() external view returns (uint256);
     function getAllowNewDeposits() external view returns (bool);
     function isAllowedLotSize(uint64 _lotSizeSatoshis) external view returns (bool);
     function requestNewKeep(uint256 _m, uint256 _n, uint256 _bond, uint256 _maxSecuredLifetime) external payable returns (address);

diff --git a/solidity/contracts/system/TBTCSystem.sol b/solidity/contracts/system/TBTCSystem.sol
@@ -381,7 +381,7 @@ contract TBTCSystem is Ownable, ITBTCSystem, DepositLog {
 
     /// @notice Gets a fee estimate for creating a new Deposit.
     /// @return Uint256 estimate.
-    function createNewDepositFeeEstimate()
+    function getNewDepositFeeEstimate()
         external
         view
         returns (uint256)