From 4384018f65f9723a3e797f2d2565406b04f5e48f Mon Sep 17 00:00:00 2001
From: soloseng <102702451+soloseng@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:42:11 -0500
Subject: [PATCH] re-org files to avoid migration conflict

---
 .../common/test}/IntegerSortedLinkedListMock.sol              | 4 +++-
 packages/protocol/migrationsConfig.js                         | 2 +-
 .../governance/validators/IntergerSortedLinkedList.t.sol      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename packages/protocol/{test-sol/governance/validators => contracts/common/test}/IntegerSortedLinkedListMock.sol (88%)

diff --git a/packages/protocol/test-sol/governance/validators/IntegerSortedLinkedListMock.sol b/packages/protocol/contracts/common/test/IntegerSortedLinkedListMock.sol
similarity index 88%
rename from packages/protocol/test-sol/governance/validators/IntegerSortedLinkedListMock.sol
rename to packages/protocol/contracts/common/test/IntegerSortedLinkedListMock.sol
index 18612e2c4c5..2c53537e7d5 100644
--- a/packages/protocol/test-sol/governance/validators/IntegerSortedLinkedListMock.sol
+++ b/packages/protocol/contracts/common/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
index 92db3f9d4b1..472c5360c6a 100644
--- 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
index 0732101a844..3360f4a13ec 100644
--- 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;