Require fully qualified contract name params for library link util

test/integration/compoundUniswapLeverageDebtIssuance.spec.ts

@@ -152,7 +152,7 @@ describe("CompoundUniswapLeverageDebtIssuance", () => {
       compoundSetup.comptroller.address,
       cEther.address,
       setup.weth.address,
-      "Compound",
+      "contracts/protocol/integration/lib/Compound.sol:Compound",
       compoundLibrary.address,
     );
     await setup.controller.addModule(compoundLeverageModule.address);

test/protocol/integration/lib/compound.spec.ts

@@ -48,7 +48,10 @@ describe("Compound", () => {
     await setup.initialize();
 
     compoundLib = await deployer.libraries.deployCompound();
-    compoundLibMock = await deployer.mocks.deployCompoundMock("Compound", compoundLib.address);
+    compoundLibMock = await deployer.mocks.deployCompoundMock(
+      "contracts/protocol/integration/lib/Compound.sol:Compound",
+      compoundLib.address
+    );
     invokeLibMock = await deployer.mocks.deployInvokeMock();
     await setup.controller.addModule(compoundLibMock.address);
     await setup.controller.addModule(invokeLibMock.address);

test/protocol/modules/compoundLeverageModule.spec.ts

@@ -120,7 +120,7 @@ describe("CompoundLeverageModule", () => {
       compoundSetup.comptroller.address,
       cEther.address,
       setup.weth.address,
-      "Compound",
+      "contracts/protocol/integration/lib/Compound.sol:Compound",
       compoundLibrary.address,
     );
     await setup.controller.addModule(compoundLeverageModule.address);

test/protocol/modules/compoundLeverageModule2.spec.ts

@@ -109,7 +109,7 @@ describe("CompoundLeverageModule TestSuite 2", () => {
       compoundSetup.comptroller.address,
       cEther.address,
       setup.weth.address,
-      "Compound",
+      "contracts/protocol/integration/lib/Compound.sol:Compound",
       compoundLibrary.address,
     );
     await setup.controller.addModule(compoundLeverageModule.address);

utils/common/index.ts

@@ -34,3 +34,6 @@ export {
   calculateTokensInReserve,
   getReservesSafe
 } from "./uniswapUtils";
+export {
+  convertLibraryNameToLinkId
+} from "./libraryUtils";

utils/common/libraryUtils.ts

@@ -0,0 +1,16 @@
+import { utils } from "ethers";
+import path from "path";
+
+// Converts a fully qualified contract name in a bytecode link id.
+// (A fully qualified name looks like: `contracts/mocks/LibraryMock.sol:LibraryMock`)
+export function convertLibraryNameToLinkId(libraryName: string): string {
+  if (!(libraryName.includes(path.sep) && libraryName.includes(":"))) {
+    throw new Error(
+      "Converting library name to link id requires a fully qualified " +
+      "contract name. Example: `contracts/mocks/LibraryMock.sol:LibraryMock`"
+    );
+  }
+
+  const hashedName = utils.keccak256(utils.toUtf8Bytes(libraryName));
+  return `__$${hashedName.slice(2).slice(0, 34)}$__`;
+}

utils/deploys/deployMocks.ts

@@ -42,8 +42,7 @@ import {
   ZeroExMock,
 } from "../contracts";
 
-import { ether } from "../common";
-import { convertLibraryNameToLinkId } from "../test";
+import { convertLibraryNameToLinkId, ether } from "../common";
 
 import { AaveLendingPoolCoreMock__factory } from "../../typechain/factories/AaveLendingPoolCoreMock__factory";
 import { AaveLendingPoolMock__factory } from "../../typechain/factories/AaveLendingPoolMock__factory";

utils/deploys/deployModules.ts

@@ -1,5 +1,5 @@
 import { Signer } from "ethers";
-import { convertLibraryNameToLinkId } from "../test";
+import { convertLibraryNameToLinkId } from "../common";
 
 import {
   AirdropModule,

utils/test/index.ts

@@ -32,6 +32,3 @@ export {
   mineBlockAsync,
   cacheBeforeEach
 } from "./testingUtils";
-export {
-  convertLibraryNameToLinkId
-} from "./libraryUtils";