re-org files to avoid migration conflict

celo-org · Jan 16, 2024 · 4384018 · 4384018
1 parent 67052f6
commit 4384018
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...alidators/IntegerSortedLinkedListMock.sol → ...mmon/test/IntegerSortedLinkedListMock.sol b/...alidators/IntegerSortedLinkedListMock.sol → ...mmon/test/IntegerSortedLinkedListMock.sol
@@ -1,6 +1,8 @@
 pragma solidity ^0.5.13;
 
-import "@celo-contracts/common/linkedlists/IntegerSortedLinkedList.sol";
+// TODO: move file to @test-sol/governance/validator when migrations is moved to foundry.
+
+import "../linkedlists/IntegerSortedLinkedList.sol";
 
 contract IntegerSortedLinkedListMock {
   using IntegerSortedLinkedList for SortedLinkedList.List;

diff --git a/packages/protocol/migrationsConfig.js b/packages/protocol/migrationsConfig.js
@@ -582,7 +582,7 @@ const linkedLibraries = {
   Proposals: ['Governance'],
   AddressLinkedList: ['Validators', 'ValidatorsTest'],
   AddressSortedLinkedList: ['Election', 'ElectionTest'],
-  IntegerSortedLinkedList: ['Governance', 'IntegerSortedLinkedListTest'],
+  IntegerSortedLinkedList: ['Governance', 'IntegerSortedLinkedListMock'],
   AddressSortedLinkedListWithMedian: ['SortedOracles', 'AddressSortedLinkedListWithMedianTest'],
   Signatures: [
     'Accounts',

diff --git a/packages/protocol/test-sol/governance/validators/IntergerSortedLinkedList.t.sol b/packages/protocol/test-sol/governance/validators/IntergerSortedLinkedList.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.5.13;
 
 import "celo-foundry/Test.sol";
 
-import "@test-sol/governance/validators/IntegerSortedLinkedListMock.sol";
+import "@celo-contracts/common/test/IntegerSortedLinkedListMock.sol";
 
 contract IntegerSortedLinkedListTest is Test {
   IntegerSortedLinkedListMock public integerSortedLinkedListMock;