Fix CI (#422)

* fix: Remove deploy steward script * fix: Remove old gho steward from tests * fix: Add rpc mainnet env var to ci
aave · Sep 4, 2024 · fe72684 · fe72684
1 parent a41f8a2
commit fe72684
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 302 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -7,6 +7,7 @@ jobs:
     env:
       ALCHEMY_KEY: '${{secrets.ALCHEMY_KEY}}'
       ETH_RPC_URL: 'https://eth-mainnet.g.alchemy.com/v2/${{secrets.ALCHEMY_KEY}}'
+      RPC_MAINNET: 'https://eth-mainnet.g.alchemy.com/v2/${{secrets.ALCHEMY_KEY}}'
     strategy:
       matrix:
         node-version:

diff --git a/deploy/10_deploy_ghomanager.ts b/deploy/10_deploy_ghomanager.ts
diff --git a/helpers/contract-getters.ts b/helpers/contract-getters.ts
@@ -23,8 +23,6 @@ import {
   VariableDebtToken,
   StakedAaveV3,
   GhoFlashMinter,
-  GhoSteward,
-  GhoStableDebtToken,
 } from '../types';
 
 // Prevent error HH9 when importing this file inside tasks or helpers at Hardhat config load
@@ -78,9 +76,6 @@ export const getGhoStableDebtToken = async (
     address || (await hre.deployments.get('GhoStableDebtToken')).address
   );
 
-export const getGhoSteward = async (address?: tEthereumAddress): Promise<GhoSteward> =>
-  getContract('GhoSteward', address || (await hre.deployments.get('GhoSteward')).address);
-
 export const getBaseImmutableAdminUpgradeabilityProxy = async (
   address: tEthereumAddress
 ): Promise<BaseImmutableAdminUpgradeabilityProxy> =>

diff --git a/tasks/main/gho-testnet-setup.ts b/tasks/main/gho-testnet-setup.ts
@@ -43,15 +43,7 @@ task('gho-testnet-setup', 'Deploy and Configure Gho').setAction(async (params, h
   blankSpace();
   await hre.run('upgrade-stkAave');
 
-  /*****************************************
-   *               ADD GhoSteward          *
-   ******************************************/
   blankSpace();
-
-  await hre.run('add-gho-steward');
-
-  console.log(`\nGho Setup Complete!\n`);
-
   await hre.run('print-all-deployments');
 });
 

diff --git a/tasks/testnet-setup/07_add-gho-steward.ts b/tasks/testnet-setup/07_add-gho-steward.ts
diff --git a/test/gho-steward.test.ts b/test/gho-steward.test.ts
diff --git a/test/helpers/make-suite.ts b/test/helpers/make-suite.ts
@@ -19,7 +19,6 @@ import {
   StakedAaveV3,
   MintableERC20,
   GhoFlashMinter,
-  GhoSteward,
 } from '../../types';
 import {
   getGhoDiscountRateStrategy,
@@ -31,7 +30,6 @@ import {
   getStakedAave,
   getMintableErc20,
   getGhoFlashMinter,
-  getGhoSteward,
   getGhoStableDebtToken,
 } from '../../helpers/contract-getters';
 import {
@@ -85,7 +83,6 @@ export interface TestEnv {
   aaveToken: IERC20;
   flashMinter: GhoFlashMinter;
   faucetOwner: Faucet;
-  ghoSteward: GhoSteward;
 }
 
 let HardhatSnapshotId: string = '0x1';
@@ -123,7 +120,6 @@ const testEnv: TestEnv = {
   aaveToken: {} as IERC20,
   flashMinter: {} as GhoFlashMinter,
   faucetOwner: {} as Faucet,
-  ghoSteward: {} as GhoSteward,
 } as TestEnv;
 
 export async function initializeMakeSuite() {
@@ -166,8 +162,6 @@ export async function initializeMakeSuite() {
     tokenProxyAddresses.variableDebtTokenAddress
   );
 
-  testEnv.ghoSteward = await getGhoSteward();
-
   testEnv.aTokenImplementation = await getGhoAToken();
   testEnv.stableDebtTokenImplementation = await getGhoStableDebtToken();
   testEnv.variableDebtTokenImplementation = await getGhoVariableDebtToken();