Attempt to fix linking libraries not working with deployCodeTo https:…

…//github.com/foundry-rs/foundry/issues/4049
celo-org · Aug 22, 2024 · 9418531 · 9418531
1 parent 9fdfe14
commit 9418531
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/packages/protocol/contracts-0.8/governance/test/IValidatorsMock.sol b/packages/protocol/contracts-0.8/governance/test/IValidatorsMock.sol
@@ -0,0 +1,5 @@
+pragma solidity >=0.5.13 <0.9.0;
+
+interface IValidatorsMockFactory {
+  function deployValidatorsMock(bool test) external returns (address);
+}
diff --git a/packages/protocol/test-sol/unit/governance/validators/Validators05.t.sol b/packages/protocol/test-sol/unit/governance/validators/Validators05.t.sol
@@ -15,6 +15,8 @@ import "@celo-contracts-8/common/interfaces/IPrecompiles.sol";
 import "@celo-contracts/governance/Election.sol";
 import "@celo-contracts/governance/LockedGold.sol";
 import "@celo-contracts/governance/interfaces/IValidators.sol";
+// import "./ValidatorsMockFactory.sol";
+import "@celo-contracts-8/governance/test/IValidatorsMock.sol";
 
 import "@celo-contracts/stability/test/MockStableToken.sol";
 import "@celo-contracts/governance/test/MockElection.sol";
@@ -169,8 +171,14 @@ contract ValidatorsTest is Test, TestConstants, Utils, ECDSAHelper {
 
     lockedGold = new MockLockedGold();
     election = new MockElection();
-    address validatorsAddress = actor("Validators");
-    deployCodeTo("ValidatorsMock.sol", validatorsAddress);
+    // address validatorsAddress = actor("Validators");
+    address validatorsMockFactoryAddress = actor("validatorsMockFactory");
+    deployCodeTo("ValidatorsMockFactory.sol", validatorsMockFactoryAddress);
+
+    address validatorsAddress = IValidatorsMockFactory(validatorsMockFactoryAddress)
+      .deployValidatorsMock(false);
+
+    // deployCodeTo("ValidatorsMock.sol", validatorsAddress);
     validators = IValidators(validatorsAddress);
     validatorsMockTunnel = new ValidatorsMockTunnel(address(validators));
 

diff --git a/packages/protocol/test-sol/unit/governance/validators/ValidatorsMockFactory.sol b/packages/protocol/test-sol/unit/governance/validators/ValidatorsMockFactory.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.7 <0.8.20;
+
+import "@celo-contracts-8/governance/test/ValidatorsMock.sol";
+import "@celo-contracts-8/governance/test/IValidatorsMock.sol";
+
+contract ValidatorsMockFactory {
+  function deployValidatorsMock(bool test) external returns (address) {
+    return address(new ValidatorsMock());
+  }
+}