From 55849cc464d171362e99b9eca7718b8b8448afb8 Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Mon, 20 May 2024 04:24:34 -0400 Subject: [PATCH] underscores Signed-off-by: Matt Rice --- src/factories/BaseFactory.sol | 4 ++-- src/factories/StandardChainlinkFactory.sol | 4 ++-- src/factories/StandardChronicleFactory.sol | 14 +++++++++---- src/factories/StandardCoinbaseFactory.sol | 24 +++++++++++----------- src/factories/StandardPythFactory.sol | 4 ++-- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/factories/BaseFactory.sol b/src/factories/BaseFactory.sol index 897c050..f4fcd8c 100644 --- a/src/factories/BaseFactory.sol +++ b/src/factories/BaseFactory.sol @@ -23,8 +23,8 @@ contract BaseFactory is Ownable { address[] unlockers ); - constructor(uint256 maxTraversal, address[] memory _defaultUnlockers) { - MAX_TRAVERSAL = maxTraversal; + constructor(uint256 _maxTraversal, address[] memory _defaultUnlockers) { + MAX_TRAVERSAL = _maxTraversal; setDefaultUnlockers(_defaultUnlockers); } diff --git a/src/factories/StandardChainlinkFactory.sol b/src/factories/StandardChainlinkFactory.sol index 35c40f4..62fd00e 100644 --- a/src/factories/StandardChainlinkFactory.sol +++ b/src/factories/StandardChainlinkFactory.sol @@ -35,8 +35,8 @@ contract OvalChainlink is MutableUnlockersController, ChainlinkSourceAdapter, Ch * mutability choices are desired. */ contract StandardChainlinkFactory is Ownable, BaseFactory { - constructor(uint256 maxTraversal, address[] memory _defaultUnlockers) - BaseFactory(maxTraversal, _defaultUnlockers) + constructor(uint256 _maxTraversal, address[] memory _defaultUnlockers) + BaseFactory(_maxTraversal, _defaultUnlockers) {} /** diff --git a/src/factories/StandardChronicleFactory.sol b/src/factories/StandardChronicleFactory.sol index 80b9a23..62633bc 100644 --- a/src/factories/StandardChronicleFactory.sol +++ b/src/factories/StandardChronicleFactory.sol @@ -14,12 +14,18 @@ import {IMedian} from "../interfaces/chronicle/IMedian.sol"; * Chronicle price feeds and allow usage via the Chainlink interface. */ contract OvalChronicle is MutableUnlockersController, ChronicleMedianSourceAdapter, ChainlinkDestinationAdapter { - constructor(IMedian source, address[] memory unlockers, uint256 lockWindow, uint256 maxTraversal, address owner) - ChronicleMedianSourceAdapter(source) - MutableUnlockersController(lockWindow, maxTraversal, unlockers) + constructor( + IMedian _source, + address[] memory _unlockers, + uint256 _lockWindow, + uint256 _maxTraversal, + address _owner + ) + ChronicleMedianSourceAdapter(_source) + MutableUnlockersController(_lockWindow, _maxTraversal, _unlockers) ChainlinkDestinationAdapter(18) { - _transferOwnership(owner); + _transferOwnership(_owner); } } diff --git a/src/factories/StandardCoinbaseFactory.sol b/src/factories/StandardCoinbaseFactory.sol index 7d0f8b0..8d5740a 100644 --- a/src/factories/StandardCoinbaseFactory.sol +++ b/src/factories/StandardCoinbaseFactory.sol @@ -14,18 +14,18 @@ import {BaseFactory} from "./BaseFactory.sol"; */ contract OvalCoinbase is MutableUnlockersController, CoinbaseSourceAdapter, ChainlinkDestinationAdapter { constructor( - IAggregatorV3SourceCoinbase source, - string memory ticker, - address[] memory unlockers, - uint256 lockWindow, - uint256 maxTraversal, - address owner + IAggregatorV3SourceCoinbase _source, + string memory _ticker, + address[] memory _unlockers, + uint256 _lockWindow, + uint256 _maxTraversal, + address _owner ) - CoinbaseSourceAdapter(source, ticker) - MutableUnlockersController(lockWindow, maxTraversal, unlockers) + CoinbaseSourceAdapter(_source, _ticker) + MutableUnlockersController(_lockWindow, _maxTraversal, _unlockers) ChainlinkDestinationAdapter(18) { - _transferOwnership(owner); + _transferOwnership(_owner); } } @@ -38,10 +38,10 @@ contract OvalCoinbase is MutableUnlockersController, CoinbaseSourceAdapter, Chai contract StandardCoinbaseFactory is Ownable, BaseFactory { IAggregatorV3SourceCoinbase immutable SOURCE; - constructor(IAggregatorV3SourceCoinbase source, uint256 maxTraversal, address[] memory _defaultUnlockers) - BaseFactory(maxTraversal, _defaultUnlockers) + constructor(IAggregatorV3SourceCoinbase _source, uint256 _maxTraversal, address[] memory _defaultUnlockers) + BaseFactory(_maxTraversal, _defaultUnlockers) { - SOURCE = source; + SOURCE = _source; } /** diff --git a/src/factories/StandardPythFactory.sol b/src/factories/StandardPythFactory.sol index f97f8a6..9bcea08 100644 --- a/src/factories/StandardPythFactory.sol +++ b/src/factories/StandardPythFactory.sol @@ -39,8 +39,8 @@ contract OvalPyth is MutableUnlockersController, PythSourceAdapter, ChainlinkDes contract StandardPythFactory is Ownable, BaseFactory { IPyth immutable pyth; - constructor(IPyth _pyth, uint256 maxTraversal, address[] memory _defaultUnlockers) - BaseFactory(maxTraversal, _defaultUnlockers) + constructor(IPyth _pyth, uint256 _maxTraversal, address[] memory _defaultUnlockers) + BaseFactory(_maxTraversal, _defaultUnlockers) { pyth = _pyth; }