Fix conflicts... again

hyperlane-xyz · May 3, 2024 · 2b65365 · 2b65365
2 parents 9e4c0d2 + 707967e
commit 2b65365
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/typescript/sdk/src/crud/EvmWarpCrudModule.ts b/typescript/sdk/src/crud/EvmWarpCrudModule.ts
@@ -40,7 +40,6 @@ export class EvmERC20WarpCrudModule extends CrudModule<
     >,
   ) {
     super(args);
-    super(args);
 
     this.reader = new EvmERC20WarpRouteReader(multiProvider, args.chain);
   }

diff --git a/typescript/sdk/src/token/deploy.hardhat-test.ts b/typescript/sdk/src/token/deploy.hardhat-test.ts
@@ -6,7 +6,6 @@ import {
   ERC20Test,
   ERC20Test__factory,
   Mailbox,
-  Mailbox,
   Mailbox__factory,
 } from '@hyperlane-xyz/core';
 import { IsmType, RouterConfig, TestChainName } from '@hyperlane-xyz/sdk';
@@ -15,12 +14,10 @@ import { objMap } from '@hyperlane-xyz/utils';
 import { TestCoreApp } from '../core/TestCoreApp.js';
 import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
 import { EvmERC20WarpCrudModule } from '../crud/EvmWarpCrudModule.js';
-import { EvmERC20WarpCrudModule } from '../crud/EvmWarpCrudModule.js';
 import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
 import { randomAddress } from '../test/testUtils.js';
-import { randomAddress } from '../test/testUtils.js';
 import { ChainMap } from '../types.js';
 
 import {
@@ -48,7 +45,6 @@ describe('TokenDeployer', async () => {
   let routerConfigMap: ChainMap<RouterConfig>;
   let config: WarpRouteDeployConfig;
   let baseConfig: RouterConfig;
-  let baseConfig: RouterConfig;
 
   before(async () => {
     [signer] = await hre.ethers.getSigners();
@@ -152,7 +148,6 @@ describe('TokenDeployer', async () => {
         },
       };
       // Deploy with config
-      const warpRoute = await deployer.deploy(
       const warpRoute = await deployer.deploy(
         config as ChainMap<TokenConfig & RouterConfig>,
       );
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ export class EvmERC20WarpCrudModule extends CrudModule< @@
         >,
       ) {
         super(args);
-        super(args);
         this.reader = new EvmERC20WarpRouteReader(multiProvider, args.chain);
       }
@@ Expand Down @@