From 11f5b958b5a6370a1b2a710ec8a565606ed66fd6 Mon Sep 17 00:00:00 2001
From: Daniil <bd3396121@gmail.com>
Date: Thu, 13 Oct 2022 15:08:27 +0300
Subject: [PATCH] Removed redundant objects, deployments, etc

---
 hardhat.config.ts                | 21 ++++++---------------
 helpers/contracts-deployments.ts |  2 +-
 helpers/contracts-helpers.ts     |  1 -
 tasks/migrations/aave.neon.ts    |  1 -
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 682c943..64dbdeb 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -9,15 +9,9 @@ import {
   eNetwork,
   ePolygonNetwork,
   eXDaiNetwork,
-  eNeonNetwork,
 } from './helpers/types';
 import { BUIDLEREVM_CHAINID, COVERAGE_CHAINID } from './helpers/buidler-constants';
-import {
-  NETWORKS_RPC_URL,
-  NETWORKS_DEFAULT_GAS,
-  BLOCK_TO_FORK,
-  buildForkConfig,
-} from './helper-hardhat-config';
+import { NETWORKS_RPC_URL, NETWORKS_DEFAULT_GAS, buildForkConfig } from './helper-hardhat-config';
 
 require('dotenv').config();
 
@@ -28,7 +22,6 @@ import 'hardhat-gas-reporter';
 import 'hardhat-typechain';
 import '@tenderly/hardhat-tenderly';
 import 'solidity-coverage';
-import { fork } from 'child_process';
 
 const SKIP_LOAD = process.env.SKIP_LOAD === 'true';
 const DEFAULT_BLOCK_GAS_LIMIT = 8000000;
@@ -70,8 +63,6 @@ const getCommonNetworkConfig = (networkName: eNetwork, networkId: number) => ({
   },
 });
 
-let forkMode;
-
 const buidlerConfig: HardhatUserConfig = {
   solidity: {
     version: '0.6.12',
@@ -158,11 +149,11 @@ const buidlerConfig: HardhatUserConfig = {
       allowUnlimitedContractSize: false,
       timeout: 100000000,
       // @ts-ignore
-      isFork: true
+      isFork: true,
     },
     devnet: {
-      url: 'https://proxy.devnet.neonlabs.org/solana',
-      // url: 'https://devnet.neonevm.org',
+      // url: 'https://proxy.devnet.neonlabs.org/solana',
+      url: 'https://devnet.neonevm.org',
       accounts: [
         '0x41167312f8c46439b2bcc5e5a6af929262efcd20357a56ebcbc455d835d9f084',
         '0x41167312f8c46439b2bcc5e5a6af929262efcd20357a56ebcbc455d835d9f081',
@@ -177,8 +168,8 @@ const buidlerConfig: HardhatUserConfig = {
       // allowUnlimitedContractSize: false,
       timeout: 100000000,
       // @ts-ignore
-      isFork: true
-    }
+      isFork: true,
+    },
   },
 };
 
diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts
index f54c61c..4584eec 100644
--- a/helpers/contracts-deployments.ts
+++ b/helpers/contracts-deployments.ts
@@ -521,7 +521,7 @@ export const deployAllMockTokens = async (verify?: boolean) => {
   for (const tokenSymbol of Object.keys(TokenContractId)) {
     let decimals = '18';
 
-    if (i > 2) break;
+    if (i > 1) break;
     i += 1;
 
     let configData = (<any>protoConfigData)[tokenSymbol];
diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts
index f612e3d..d092607 100644
--- a/helpers/contracts-helpers.ts
+++ b/helpers/contracts-helpers.ts
@@ -110,7 +110,6 @@ export const withSaveAndVerify = async <ContractType extends Contract>(
   args: (string | string[])[],
   verify?: boolean
 ): Promise<ContractType> => {
-  // console.log('Here: ', instance.deployTransaction.hash);
   await waitForTx(instance.deployTransaction);
   await registerContractInJsonDb(id, instance);
   if (verify) {
diff --git a/tasks/migrations/aave.neon.ts b/tasks/migrations/aave.neon.ts
index 2a06e52..32c17bf 100644
--- a/tasks/migrations/aave.neon.ts
+++ b/tasks/migrations/aave.neon.ts
@@ -35,7 +35,6 @@ task('aave:neon', 'Test scenarios on NEON')
 
     let DAI = await getMintableERC20(reserves[0]);
     let AAVE = await getMintableERC20(reserves[1]);
-    let TUSD = await getMintableERC20(reserves[2]);
 
     await DAI.connect(user1).mint(DRE.ethers.utils.parseUnits('10', 6));
     await AAVE.connect(user2).mint(DRE.ethers.utils.parseUnits('10', 6));