dev: minor changes on casing

kkrt-labs · Oct 17, 2023 · b85f3ad · b85f3ad
1 parent 03f5be8
commit b85f3ad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/crates/contracts/src/kakarot_core/kakarot.cairo b/crates/contracts/src/kakarot_core/kakarot.cairo
@@ -19,8 +19,7 @@ struct ContractAccountStorage {
 mod KakarotCore {
     use contracts::components::ownable::ownable_component::InternalTrait;
     use contracts::components::ownable::{ownable_component};
-    use contracts::components::upgradeable::IUpgradeable;
-    use contracts::components::upgradeable::{upgradeable_component};
+    use contracts::components::upgradeable::{IUpgradeable, upgradeable_component};
     use contracts::kakarot_core::interface::IKakarotCore;
     use contracts::kakarot_core::interface;
     use core::hash::{HashStateExTrait, HashStateTrait};
@@ -44,7 +43,7 @@ mod KakarotCore {
 
     impl OwnableInternalImpl = ownable_component::InternalImpl<ContractState>;
 
-    impl upgradeableImpl = upgradeable_component::UpgradeableImpl<ContractState>;
+    impl upgradeableImpl = upgradeable_component::Upgradeable<ContractState>;
 
     #[storage]
     struct Storage {

diff --git a/crates/contracts/src/tests/test_upgradeable.cairo b/crates/contracts/src/tests/test_upgradeable.cairo
@@ -50,31 +50,6 @@ impl TestingStateDefault of Default<TestingState> {
     }
 }
 
-#[test]
-#[available_gas(500000)]
-fn test_upgradeable_update_contract() {
-    let (contract_address, _) = deploy_syscall(
-        MockContractUpgradeableV0::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false
-    )
-        .unwrap();
-
-    let version = IMockContractUpgradeableDispatcher { contract_address: contract_address }
-        .version();
-
-    assert(version == 0, 'version is not 0');
-
-    let mut call_data: Array<felt252> = array![];
-
-    let new_class_hash: ClassHash = MockContractUpgradeableV1::TEST_CLASS_HASH.try_into().unwrap();
-
-    IUpgradeableDispatcher { contract_address: contract_address }.upgrade_contract(new_class_hash);
-
-    let version = IMockContractUpgradeableDispatcher { contract_address: contract_address }
-        .version();
-    assert(version == 1, 'version is not 1');
-}
-
-
 #[starknet::contract]
 mod MockContractUpgradeableV1 {
     use contracts::components::upgradeable::{upgradeable_component};
@@ -100,3 +75,27 @@ mod MockContractUpgradeableV1 {
         }
     }
 }
+
+#[test]
+#[available_gas(500000)]
+fn test_upgradeable_update_contract() {
+    let (contract_address, _) = deploy_syscall(
+        MockContractUpgradeableV0::TEST_CLASS_HASH.try_into().unwrap(), 0, array![].span(), false
+    )
+        .unwrap();
+
+    let version = IMockContractUpgradeableDispatcher { contract_address: contract_address }
+        .version();
+
+    assert(version == 0, 'version is not 0');
+
+    let mut call_data: Array<felt252> = array![];
+
+    let new_class_hash: ClassHash = MockContractUpgradeableV1::TEST_CLASS_HASH.try_into().unwrap();
+
+    IUpgradeableDispatcher { contract_address: contract_address }.upgrade_contract(new_class_hash);
+
+    let version = IMockContractUpgradeableDispatcher { contract_address: contract_address }
+        .version();
+    assert(version == 1, 'version is not 1');
+}