fix: merge conflicts

lidofinance · May 22, 2024 · fa2894e · fa2894e
1 parent 3a35eb4
commit fa2894e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/test/0.4.24/nor/node-operators-registry.test.ts b/test/0.4.24/nor/node-operators-registry.test.ts
@@ -18,7 +18,7 @@ import {
 } from "typechain-types";
 import { NodeOperatorsRegistryLibraryAddresses } from "typechain-types/factories/contracts/0.4.24/nos/NodeOperatorsRegistry.sol/NodeOperatorsRegistry__factory";
 
-import { addAragonApp, deployLidoDao, hasPermission } from "lib";
+import { addAragonApp, deployLidoDao, hasPermission } from "test/deploy";
 
 const CURATED_TYPE = "0x637572617465642d6f6e636861696e2d76310000000000000000000000000000"; // "curated-onchain-v1"
 const PENALTY_DELAY = 2 * 24 * 60 * 60; // 2 days

diff --git a/test/0.8.9/depositSecurityModule.test.ts b/test/0.8.9/depositSecurityModule.test.ts
@@ -23,7 +23,7 @@ import {
   StakingRouterMockForDepositSecurityModule,
 } from "typechain-types";
 
-import { certainAddress, DSMAttestMessage, DSMPauseMessage, ether, streccak } from "lib";
+import { certainAddress, DSMAttestMessage, DSMPauseMessage, DSMUnvetMessage, ether, streccak } from "lib";
 
 import { Snapshot } from "test/suite";
 

diff --git a/test/deploy/dao.ts b/test/deploy/dao.ts
@@ -48,7 +48,7 @@ async function createAragonDao(rootAccount: HardhatEthersSigner) {
   return { dao, acl };
 }
 
-async function addAragonApp({ dao, name, impl, rootAccount }: CreateAddAppArgs): Promise<string> {
+export async function addAragonApp({ dao, name, impl, rootAccount }: CreateAddAppArgs): Promise<string> {
   const tx = await dao["newAppInstance(bytes32,address,bytes,bool)"](
     streccak(`${name}.aragonpm.test`),
     await impl.getAddress(),