Commit 8ada905b authored by clabby's avatar clabby

fmt

parent 8bc13075
...@@ -47,18 +47,11 @@ library ChainAssertions { ...@@ -47,18 +47,11 @@ library ChainAssertions {
} }
/// @notice Asserts that the SystemConfig is setup correctly /// @notice Asserts that the SystemConfig is setup correctly
function checkSystemConfig( function checkSystemConfig(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _proxy) internal view {
Types.ContractSet memory _contracts,
DeployConfig _cfg,
bool _initialized
)
internal
view
{
ISystemConfigV0 config = ISystemConfigV0(_contracts.SystemConfig); ISystemConfigV0 config = ISystemConfigV0(_contracts.SystemConfig);
ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG(); ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG();
if (_initialized) { if (_proxy) {
require(config.owner() == _cfg.finalSystemOwner()); require(config.owner() == _cfg.finalSystemOwner());
require(config.overhead() == _cfg.gasPriceOracleOverhead()); require(config.overhead() == _cfg.gasPriceOracleOverhead());
require(config.scalar() == _cfg.gasPriceOracleScalar()); require(config.scalar() == _cfg.gasPriceOracleScalar());
...@@ -166,16 +159,9 @@ library ChainAssertions { ...@@ -166,16 +159,9 @@ library ChainAssertions {
} }
/// @notice Asserts that the ProtocolVersions is setup correctly /// @notice Asserts that the ProtocolVersions is setup correctly
function checkProtocolVersions( function checkProtocolVersions(Types.ContractSet memory _proxies, DeployConfig _cfg, bool _proxy) internal view {
Types.ContractSet memory _proxies,
DeployConfig _cfg,
bool _initialized
)
internal
view
{
ProtocolVersions versions = ProtocolVersions(_proxies.ProtocolVersions); ProtocolVersions versions = ProtocolVersions(_proxies.ProtocolVersions);
if (_initialized) { if (_proxy) {
require(versions.owner() == _cfg.finalSystemOwner()); require(versions.owner() == _cfg.finalSystemOwner());
require(ProtocolVersion.unwrap(versions.required()) == _cfg.requiredProtocolVersion()); require(ProtocolVersion.unwrap(versions.required()) == _cfg.requiredProtocolVersion());
require(ProtocolVersion.unwrap(versions.recommended()) == _cfg.recommendedProtocolVersion()); require(ProtocolVersion.unwrap(versions.recommended()) == _cfg.recommendedProtocolVersion());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment