cosmetic fixes

smartcontractkit · Feb 26, 2024 · 668ab22 · 668ab22
1 parent 08fdb4a
commit 668ab22
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 165 deletions.
diff --git a/contracts/src/access_control/access_controller.cairo b/contracts/src/access_control/access_controller.cairo
@@ -6,7 +6,6 @@ mod AccessController {
     use openzeppelin::access::ownable::ownable::OwnableComponent;
 
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
-    // use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
     use chainlink::libraries::type_and_version::ITypeAndVersion;
     use chainlink::libraries::upgradeable::{Upgradeable, IUpgradeable};
 

diff --git a/contracts/src/emergency/sequencer_uptime_feed.cairo b/contracts/src/emergency/sequencer_uptime_feed.cairo
@@ -29,7 +29,6 @@ mod SequencerUptimeFeed {
 
     use openzeppelin::access::ownable::ownable::OwnableComponent;
 
-    // use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
     use chainlink::libraries::access_control::AccessControlComponent::InternalTrait as AccessControlInternalTrait;
     use chainlink::libraries::type_and_version::ITypeAndVersion;

diff --git a/contracts/src/libraries.cairo b/contracts/src/libraries.cairo
@@ -1,5 +1,3 @@
-mod ownable;
-mod zownable;
 mod access_control;
 mod token;
 mod upgradeable;

diff --git a/contracts/src/libraries/access_control.cairo b/contracts/src/libraries/access_control.cairo
@@ -17,7 +17,6 @@ mod AccessControlComponent {
     use zeroable::Zeroable;
 
     use openzeppelin::access::ownable::ownable::OwnableComponent;
-    // use chainlink::libraries::ownable::{OwnableComponent};
 
     use OwnableComponent::InternalImpl as OwnableInternalImpl;
 

diff --git a/contracts/src/libraries/ownable.cairo b/contracts/src/libraries/ownable.cairo
diff --git a/contracts/src/libraries/zownable.cairo b/contracts/src/libraries/zownable.cairo
diff --git a/contracts/src/ocr2/aggregator.cairo b/contracts/src/ocr2/aggregator.cairo
@@ -200,7 +200,6 @@ mod Aggregator {
     use openzeppelin::token::erc20::interface::{IERC20, IERC20Dispatcher, IERC20DispatcherTrait};
 
     use chainlink::utils::split_felt;
-    // use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
     use chainlink::libraries::access_control::AccessControlComponent::InternalTrait as AccessControlInternalTrait;
     use chainlink::libraries::upgradeable::{Upgradeable, IUpgradeable};

diff --git a/contracts/src/ocr2/aggregator_proxy.cairo b/contracts/src/ocr2/aggregator_proxy.cairo
@@ -50,7 +50,6 @@ mod AggregatorProxy {
 
     use chainlink::ocr2::aggregator::IAggregator;
     use chainlink::ocr2::aggregator::Round;
-    // use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
     use chainlink::libraries::access_control::{AccessControlComponent, IAccessController};
     use chainlink::libraries::access_control::AccessControlComponent::InternalTrait as AccessControlInternalTrait;
     use chainlink::utils::split_felt;

diff --git a/contracts/src/tests/test_aggregator_proxy.cairo b/contracts/src/tests/test_aggregator_proxy.cairo
@@ -14,7 +14,6 @@ use core::result::ResultTrait;
 use chainlink::ocr2::mocks::mock_aggregator::{
     MockAggregator, IMockAggregator, IMockAggregatorDispatcher, IMockAggregatorDispatcherTrait
 };
-// use chainlink::ocr2::aggregator::{IAggregator, IAggregatorDispatcher, IAggregatorDispatcherTrait};
 use chainlink::ocr2::aggregator_proxy::AggregatorProxy;
 use chainlink::ocr2::aggregator_proxy::AggregatorProxy::{
     AggregatorProxyImpl, AggregatorProxyInternal, UpgradeableImpl

diff --git a/contracts/src/token/link_token.cairo b/contracts/src/token/link_token.cairo
@@ -20,7 +20,6 @@ mod LinkToken {
     use super::IMintableToken;
     use openzeppelin::token::erc20::interface::{IERC20, IERC20Dispatcher, IERC20DispatcherTrait};
     use chainlink::libraries::token::erc677::ERC677Component;
-    // use chainlink::libraries::ownable::{OwnableComponent, IOwnable};
     use chainlink::libraries::type_and_version::ITypeAndVersion;
     use chainlink::libraries::upgradeable::{Upgradeable, IUpgradeable};
 

diff --git a/examples/contracts/aggregator-consumer/src/ocr2/price_consumer_with_sequencer.cairo b/examples/contracts/aggregator-consumer/src/ocr2/price_consumer_with_sequencer.cairo
@@ -53,7 +53,7 @@ mod AggregatorPriceConsumerWithSequencer {
             0 => {
                 assert(!report_stale, 'L2 seq up & report stale');
             },
-            _ => {
+            1 | _ => {
                 assert(!report_stale, 'L2 seq down & report stale');
                 assert(false, 'L2 seq down & report ok');
             }