Organize Migrated Contracts (#10817)

* Moved to identity folder & changed shadowed variable in federated attestations * removed console log import * removed unused imports * removed blank ocntract * Added parent Contract name to test contracts * Added aliases for Celo contracts path --------- Co-authored-by: Martín Volpe <volpe@clabs.co> Co-authored-by: Martín Volpe <martin.volpe@gmail.com>
celo-org · Dec 11, 2023 · b4aa051 · b4aa051
1 parent a69accc
commit b4aa051
Show file tree

Hide file tree

Showing 20 changed files with 110 additions and 133 deletions.
diff --git a/packages/protocol/remappings.txt b/packages/protocol/remappings.txt
@@ -1 +1,3 @@
-@celo-contracts=contracts/
+@celo-contracts=contracts/
+@test-sol=test-sol
+@lib=lib
diff --git a/packages/protocol/test-sol/Accounts.t.sol b/packages/protocol/test-sol/Accounts.t.sol
@@ -3,14 +3,10 @@ pragma solidity ^0.5.13;
 pragma experimental ABIEncoderV2;
 
 import "celo-foundry/Test.sol";
-import "../contracts/identity/Escrow.sol";
-import "../contracts/identity/FederatedAttestations.sol";
-import "../contracts/identity/test/MockAttestations.sol";
-import "../contracts/identity/test/MockERC20Token.sol";
-import "../contracts/common/FixidityLib.sol";
-import "../contracts/common/Registry.sol";
-import "../contracts/common/Accounts.sol";
-import "../contracts/governance/test/MockValidators.sol";
+import "@celo-contracts/common/FixidityLib.sol";
+import "@celo-contracts/common/Registry.sol";
+import "@celo-contracts/common/Accounts.sol";
+import "@celo-contracts/governance/test/MockValidators.sol";
 
 contract AccountsTest is Test {
   using FixidityLib for FixidityLib.Fraction;
@@ -205,7 +201,7 @@ contract AccountsTest is Test {
   }
 }
 
-contract CreateAccount is AccountsTest {
+contract AccountsCreateAccount is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -223,7 +219,7 @@ contract CreateAccount is AccountsTest {
   }
 }
 
-contract SetAccountDataEncryptionKey is AccountsTest {
+contract AccountsSetAccountDataEncryptionKey is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -257,7 +253,7 @@ contract SetAccountDataEncryptionKey is AccountsTest {
   }
 }
 
-contract SetAccount is AccountsTest {
+contract AccountsSetAccount is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -345,7 +341,7 @@ contract SetAccount is AccountsTest {
   }
 }
 
-contract SetWalletAddress is AccountsTest {
+contract AccountsSetWalletAddress is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -395,7 +391,7 @@ contract SetWalletAddress is AccountsTest {
   }
 }
 
-contract SetMetadataURL is AccountsTest {
+contract AccountsSetMetadataURL is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -419,7 +415,7 @@ contract SetMetadataURL is AccountsTest {
   }
 }
 
-contract BatchGetMetadataURL is AccountsTest {
+contract AccountsBatchGetMetadataURL is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -470,7 +466,7 @@ contract BatchGetMetadataURL is AccountsTest {
   }
 }
 
-contract AddStorageRoot is AccountsTest {
+contract AccountsAddStorageRoot is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -516,7 +512,7 @@ contract AddStorageRoot is AccountsTest {
   }
 }
 
-contract RemoveStorageRoot is AccountsTest {
+contract AccountsRemoveStorageRoot is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -592,7 +588,7 @@ contract RemoveStorageRoot is AccountsTest {
   }
 }
 
-contract SetPaymentDelegation is AccountsTest {
+contract AccountsSetPaymentDelegation is AccountsTest {
   address beneficiary = actor("beneficiary");
   uint256 fraction = FixidityLib.newFixedFraction(2, 10).unwrap();
   uint256 badFraction = FixidityLib.newFixedFraction(12, 10).unwrap();
@@ -634,7 +630,7 @@ contract SetPaymentDelegation is AccountsTest {
   }
 }
 
-contract DeletePaymentDelegation is AccountsTest {
+contract AccountsDeletePaymentDelegation is AccountsTest {
   address beneficiary = actor("beneficiary");
   uint256 fraction = FixidityLib.newFixedFraction(2, 10).unwrap();
 
@@ -664,7 +660,7 @@ contract DeletePaymentDelegation is AccountsTest {
   }
 }
 
-contract SetName is AccountsTest {
+contract AccountsSetName is AccountsTest {
   function setUp() public {
     super.setUp();
   }
@@ -688,7 +684,7 @@ contract SetName is AccountsTest {
   }
 }
 
-contract GenericAuthorization is AccountsTest {
+contract AccountsGenericAuthorization is AccountsTest {
   address account2 = actor("account2");
   address signer;
   uint256 signerPK;
@@ -872,7 +868,7 @@ contract GenericAuthorization is AccountsTest {
   }
 }
 
-contract BackwardCompatibility is AccountsTest {
+contract AccountsBackwardCompatibility is AccountsTest {
   address account = address(this);
   address otherAccount = actor("otherAccount");
 

diff --git a/packages/protocol/test-sol/common/AddressSortedLinkedListWithMedian.t.sol b/packages/protocol/test-sol/common/AddressSortedLinkedListWithMedian.t.sol
@@ -2,10 +2,9 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../contracts/common/test/AddressSortedLinkedListWithMedianTest.sol";
+import "@celo-contracts/common/test/AddressSortedLinkedListWithMedianTest.sol";
 
 contract AddressSortedLinkedListWithMedianInsertTest is Test {
   AddressSortedLinkedListWithMedianTest sortedList;

diff --git a/packages/protocol/test-sol/common/ExtractFunctionSignature.t.sol b/packages/protocol/test-sol/common/ExtractFunctionSignature.t.sol
@@ -2,10 +2,9 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../contracts/common/ExtractFunctionSignature.sol";
+import "@celo-contracts/common/ExtractFunctionSignature.sol";
 
 contract ExtractFunctionSignatureWrapper {
   function extractFunctionSignature(bytes memory input) public pure returns (bytes4) {
@@ -35,7 +34,7 @@ contract ExtractFunctionSignatureTest is Test {
     testTransactions = new TestTransactions();
   }
 
-  function testExtractFunctionSignature() public {
+  function test_ExtractFunctionSignature() public {
     // Arrange
     bytes memory data = abi.encodeWithSignature("setValue(uint256,uint256,bool)", 1, 1, true);
     bytes4 expectedSignature = bytes4(keccak256("setValue(uint256,uint256,bool)"));

diff --git a/packages/protocol/test-sol/common/Fixidity.t.sol b/packages/protocol/test-sol/common/Fixidity.t.sol
@@ -2,10 +2,9 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../contracts/common/test/FixidityWrapper.sol";
+import "@celo-contracts/common/test/FixidityWrapper.sol";
 
 contract FixidityTest is Test {
   uint256 private constant FIXED1_UINT = 1000000000000000000000000;

diff --git a/packages/protocol/test-sol/common/GoldToken.t.sol b/packages/protocol/test-sol/common/GoldToken.t.sol
@@ -2,9 +2,8 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
-import "../../contracts/common/GoldToken.sol";
-import "../../contracts/common/test/MockGoldToken.sol";
+import "@celo-contracts/common/GoldToken.sol";
+import "@celo-contracts/common/test/MockGoldToken.sol";
 
 contract GoldTokenTest is Test {
   GoldToken goldToken;

diff --git a/packages/protocol/test-sol/common/LinkedList.t.sol b/packages/protocol/test-sol/common/LinkedList.t.sol
@@ -2,12 +2,11 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../contracts/common/test/LinkedListWrapper.sol";
+import "@celo-contracts/common/test/LinkedListWrapper.sol";
 
-contract Insert is Test {
+contract LinkedListInsert is Test {
   LinkedListWrapper linkedList;
   bytes32 private constant NULL_KEY = bytes32(uint256(0x00));
   bytes32 private constant FIRST_KEY = bytes32(uint256(0x01));
@@ -88,7 +87,7 @@ contract Insert is Test {
   }
 }
 
-contract Remove is Test {
+contract LinkedListRemove is Test {
   LinkedListWrapper linkedList;
 
   bytes32 private constant NULL_KEY = bytes32(uint256(0x00));

diff --git a/packages/protocol/test-sol/common/Multisig.t.sol b/packages/protocol/test-sol/common/Multisig.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "../../contracts/common/MultiSig.sol";
+import "@celo-contracts/common/MultiSig.sol";
 
 contract MultiSigTest is Test {
   function() external payable {}

diff --git a/packages/protocol/test-sol/common/Registry.t.sol b/packages/protocol/test-sol/common/Registry.t.sol
@@ -2,10 +2,9 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../contracts/common/Registry.sol";
+import "@celo-contracts/common/Registry.sol";
 
 contract RegistryTest is Test {
   event RegistryUpdated(string identifier, bytes32 indexed identifierHash, address indexed addr);

diff --git a/packages/protocol/test-sol/governance/network/EpochRewards.t.sol b/packages/protocol/test-sol/governance/network/EpochRewards.t.sol
@@ -7,14 +7,14 @@ import "@celo-contracts/common/Freezer.sol";
 
 import { MockElection } from "@celo-contracts/governance/test/MockElection.sol";
 import { EpochRewardsTest } from "@celo-contracts/governance/test/EpochRewardsTest.sol";
-import { Reserve } from "../../../lib/mento-core/contracts/Reserve.sol";
+import { Reserve } from "@lib/mento-core/contracts/Reserve.sol";
 
 import { MockSortedOracles } from "@celo-contracts/stability/test/MockSortedOracles.sol";
 import { MockStableToken } from "@celo-contracts/stability/test/MockStableToken.sol";
 import { MockGoldToken } from "@celo-contracts/common/test/MockGoldToken.sol";
 
-import { Constants } from "../../constants.sol";
-import { Utils } from "../../utils.sol";
+import { Constants } from "@test-sol/constants.sol";
+import { Utils } from "@test-sol/utils.sol";
 
 contract EpochRewardsFoundryTest is Test, Constants, Utils {
   event TargetVotingGoldFractionSet(uint256 fraction);

diff --git a/packages/protocol/test-sol/governance/network/Proposal.t.sol b/packages/protocol/test-sol/governance/network/Proposal.t.sol
@@ -2,13 +2,12 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
 
 // Contract to test
-import "../../../contracts/governance/Proposals.sol";
-import "../../../contracts/common/FixidityLib.sol";
+import "@celo-contracts/governance/Proposals.sol";
+import "@celo-contracts/common/FixidityLib.sol";
 
-contract GetSupportWithQuorumPadding is Test {
+contract ProposalGetSupportWithQuorumPadding is Test {
   using Proposals for Proposals.Proposal;
   using FixidityLib for FixidityLib.Fraction;
 

diff --git a/packages/protocol/test-sol/governance/voting/LockedGold.t.sol b/packages/protocol/test-sol/governance/voting/LockedGold.t.sol
@@ -5,17 +5,17 @@ pragma experimental ABIEncoderV2;
 import "celo-foundry/Test.sol";
 import "forge-std/console.sol";
 
-import "../../../contracts/common/FixidityLib.sol";
-import "../../../contracts/common/Registry.sol";
-import "../../../contracts/common/Accounts.sol";
-import "../../../contracts/common/test/MockGoldToken.sol";
-import "../../../contracts/governance/LockedGold.sol";
-import "../../../contracts/governance/ReleaseGold.sol";
-import "../../../contracts/governance/Election.sol";
-import "../../../contracts/stability/test/MockStableToken.sol";
-import "../../../contracts/governance/test/MockElection.sol";
-import "../../../contracts/governance/test/MockGovernance.sol";
-import "../../../contracts/governance/test/MockValidators.sol";
+import "@celo-contracts/common/FixidityLib.sol";
+import "@celo-contracts/common/Registry.sol";
+import "@celo-contracts/common/Accounts.sol";
+import "@celo-contracts/common/test/MockGoldToken.sol";
+import "@celo-contracts/governance/LockedGold.sol";
+import "@celo-contracts/governance/ReleaseGold.sol";
+import "@celo-contracts/governance/Election.sol";
+import "@celo-contracts/stability/test/MockStableToken.sol";
+import "@celo-contracts/governance/test/MockElection.sol";
+import "@celo-contracts/governance/test/MockGovernance.sol";
+import "@celo-contracts/governance/test/MockValidators.sol";
 
 contract LockedGoldTest is Test {
   using FixidityLib for FixidityLib.Fraction;

diff --git a/...ages/protocol/test-sol/Attestations.t.sol → ...ocol/test-sol/identity/Attestations.t.sol b/...ages/protocol/test-sol/Attestations.t.sol → ...ocol/test-sol/identity/Attestations.t.sol
@@ -2,14 +2,14 @@
 pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
-import "../contracts/identity/test/AttestationsTest.sol";
-import "../contracts/identity/test/MockERC20Token.sol";
-import "../contracts/identity/test/MockRandom.sol";
-import "../contracts/governance/test/MockElection.sol";
-import "../contracts/governance/test/MockLockedGold.sol";
-import "../contracts/governance/test/MockValidators.sol";
-import "../contracts/common/Registry.sol";
-import "../contracts/common/Accounts.sol";
+import "@celo-contracts/identity/test/AttestationsTest.sol";
+import "@celo-contracts/identity/test/MockERC20Token.sol";
+import "@celo-contracts/identity/test/MockRandom.sol";
+import "@celo-contracts/governance/test/MockElection.sol";
+import "@celo-contracts/governance/test/MockLockedGold.sol";
+import "@celo-contracts/governance/test/MockValidators.sol";
+import "@celo-contracts/common/Registry.sol";
+import "@celo-contracts/common/Accounts.sol";
 
 contract AttestationsFoundryTest is Test {
   enum KeyOffsets {

diff --git a/packages/protocol/test-sol/Escrow.t.sol → ...s/protocol/test-sol/identity/Escrow.t.sol b/packages/protocol/test-sol/Escrow.t.sol → ...s/protocol/test-sol/identity/Escrow.t.sol
@@ -3,14 +3,13 @@ pragma solidity ^0.5.13;
 pragma experimental ABIEncoderV2;
 
 import "celo-foundry/Test.sol";
-import "forge-std/console.sol";
-import "../contracts/identity/Escrow.sol";
-import "../contracts/identity/FederatedAttestations.sol";
-import "../contracts/identity/test/MockAttestations.sol";
-import "../contracts/identity/test/MockERC20Token.sol";
-import "../contracts/common/FixidityLib.sol";
-import "../contracts/common/Registry.sol";
-import "../contracts/common/Signatures.sol";
+import "@celo-contracts/identity/Escrow.sol";
+import "@celo-contracts/identity/FederatedAttestations.sol";
+import "@celo-contracts/identity/test/MockAttestations.sol";
+import "@celo-contracts/identity/test/MockERC20Token.sol";
+import "@celo-contracts/common/FixidityLib.sol";
+import "@celo-contracts/common/Registry.sol";
+import "@celo-contracts/common/Signatures.sol";
 
 contract EscrowTest is Test {
   using FixidityLib for FixidityLib.Fraction;
@@ -239,7 +238,7 @@ contract EscrowAddDefaultTrustedIssuer is EscrowTest {
   }
 }
 
-contract WhenMaxTrustedIssuersHaveBeenAdded is EscrowTest {
+contract EscrowWhenMaxTrustedIssuersHaveBeenAdded is EscrowTest {
   address[] expectedTrustedIssuers;
   function setUp() public {
     super.setUp();