Skip to content

Commit

Permalink
Run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
ad0ll committed Apr 30, 2024
1 parent d9dcd4d commit b674700
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions contracts/src/v0.8/llo-feeds/FeeManager.sol
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface {
bytes calldata payload,
bytes calldata parameterPayload,
address subscriber
) external virtual payable override onlyProxy {
) external payable virtual override onlyProxy {
(Common.Asset memory fee, Common.Asset memory reward, uint256 appliedDiscount) = _processFee(
payload,
parameterPayload,
Expand All @@ -200,7 +200,7 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface {
bytes[] calldata payloads,
bytes calldata parameterPayload,
address subscriber
) external virtual payable override onlyProxy {
) external payable virtual override onlyProxy {
FeeAndReward[] memory feesAndRewards = new IFeeManager.FeeAndReward[](payloads.length);

//keep track of the number of fees to prevent over initialising the FeePayment array within _convertToLinkAndNativeFees
Expand Down
8 changes: 3 additions & 5 deletions contracts/src/v0.8/llo-feeds/FeeManagerNoNative.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interface
import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
import {FeeManager} from "./FeeManager.sol";


/**
* @title FeeManagerNoNative
* @author Michael Fletcher
* @author Austin Born
* @author TJ Cunha
* @notice This contract is a variation of the FeeManager contract, and adds a modifier blocks native billing to fee handling functions
* @notice This contract is a variation of the FeeManager contract, and adds a modifier blocks native billing to fee handling functions
*/
contract FeeManagerNoNative is FeeManager {
using SafeERC20 for IERC20;
using SafeERC20 for IERC20;

/// @notice thrown when trying to pay nativeFee with native, which is disallowed when we force wETH billing for nativeFee
error NativeBillingDisallowed();
Expand Down Expand Up @@ -59,7 +58,7 @@ contract FeeManagerNoNative is FeeManager {
bytes[] calldata payloads,
bytes calldata parameterPayload,
address subscriber
) external payable override onlyProxy blockNativeBilling{
) external payable override onlyProxy blockNativeBilling {
FeeAndReward[] memory feesAndRewards = new IFeeManager.FeeAndReward[](payloads.length);

//keep track of the number of fees to prevent over initialising the FeePayment array within _convertToLinkAndNativeFees
Expand Down Expand Up @@ -97,5 +96,4 @@ contract FeeManagerNoNative is FeeManager {
_handleFeesAndRewards(subscriber, feesAndRewards, numberOfLinkFees, numberOfNativeFees);
}
}

}

0 comments on commit b674700

Please sign in to comment.