fix for test to run

marinade-finance · Dec 26, 2023 · a72fa1b · a72fa1b
1 parent ec74fe6
commit a72fa1b
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 21 deletions.
diff --git a/packages/validator-bonds-cli/__tests__/test-validator/initConfig.spec.ts b/packages/validator-bonds-cli/__tests__/test-validator/initConfig.spec.ts
@@ -8,27 +8,28 @@ import {
   Transaction,
 } from '@solana/web3.js'
 import {
-  VALIDATOR_BONDS_PROGRAM_ID,
+  ValidatorBondsProgram,
   getConfig,
-  getProgram,
 } from '@marinade.finance/validator-bonds-sdk'
+import { initTest } from './utils'
 
 beforeAll(() => {
   shellMatchers()
 })
 
 describe('Init config account using CLI', () => {
-  const provider = AnchorProvider.env()
-  provider.opts.skipPreflight = true
-  const program = getProgram({
-    connection: provider,
-    programId: VALIDATOR_BONDS_PROGRAM_ID,
-  })
+  let provider: AnchorProvider
+  let program: ValidatorBondsProgram
 
   let configPath: string
   let configKeypair: Keypair
   let configCleanup: () => Promise<void>
 
+  beforeAll(async () => {
+    shellMatchers()
+    ;({ provider, program } = await initTest())
+  })
+
   beforeEach(async () => {
     // eslint-disable-next-line @typescript-eslint/no-extra-semi
     ;({

diff --git a/packages/validator-bonds-cli/__tests__/test-validator/show.spec.ts b/packages/validator-bonds-cli/__tests__/test-validator/show.spec.ts
@@ -2,28 +2,26 @@ import { AnchorProvider } from '@coral-xyz/anchor'
 import { shellMatchers } from '@marinade.finance/jest-utils'
 import YAML from 'yaml'
 import {
-  getProgram,
   initConfigInstruction,
-  VALIDATOR_BONDS_PROGRAM_ID,
   findBondsWithdrawerAuthority,
+  ValidatorBondsProgram,
 } from '@marinade.finance/validator-bonds-sdk'
 import { executeTxSimple } from '@marinade.finance/web3js-common'
 import { transaction } from '@marinade.finance/anchor-common'
 import { Keypair } from '@solana/web3.js'
+import { initTest } from './utils'
 
 beforeAll(() => {
   shellMatchers()
 })
 
 describe('Show command using CLI', () => {
-  const provider = AnchorProvider.env()
-  provider.opts.skipPreflight = true
-  provider.opts.commitment = 'confirmed'
-  const program = getProgram({
-    connection: provider.connection,
-    wallet: provider.wallet,
-    opts: provider.opts,
-    programId: VALIDATOR_BONDS_PROGRAM_ID,
+  let provider: AnchorProvider
+  let program: ValidatorBondsProgram
+
+  beforeAll(async () => {
+    shellMatchers()
+    ;({ provider, program } = await initTest())
   })
 
   it('show config', async () => {
@@ -74,6 +72,7 @@ describe('Show command using CLI', () => {
           operatorAuthority: operatorAuthority.toBase58(),
           epochsToClaimSettlement: 101,
           withdrawLockupEpochs: 102,
+          minimumStakeLamports: 1000000000,
           bondsWithdrawerAuthorityBump,
           reserved: [512],
         },
@@ -111,6 +110,7 @@ describe('Show command using CLI', () => {
             operatorAuthority: operatorAuthority.toBase58(),
             epochsToClaimSettlement: 101,
             withdrawLockupEpochs: 102,
+            minimumStakeLamports: 1000000000,
             bondsWithdrawerAuthorityBump,
             reserved: [512],
           },
@@ -175,6 +175,7 @@ describe('Show command using CLI', () => {
             operatorAuthority: operatorAuthority.toBase58(),
             epochsToClaimSettlement: 101,
             withdrawLockupEpochs: 102,
+            minimumStakeLamports: 1000000000,
             bondsWithdrawerAuthorityBump,
             reserved: [512],
           },

diff --git a/packages/validator-bonds-cli/__tests__/test-validator/utils.ts b/packages/validator-bonds-cli/__tests__/test-validator/utils.ts
@@ -0,0 +1,19 @@
+import * as anchor from '@coral-xyz/anchor'
+import { AnchorProvider } from '@coral-xyz/anchor'
+import {
+  ValidatorBondsProgram,
+  getProgram,
+} from '@marinade.finance/validator-bonds-sdk'
+
+export async function initTest(): Promise<{
+  program: ValidatorBondsProgram
+  provider: AnchorProvider
+}> {
+  if (process.env.ANCHOR_PROVIDER_URL?.includes('localhost')) {
+    // workaround to: https://github.com/coral-xyz/anchor/pull/2725
+    process.env.ANCHOR_PROVIDER_URL = 'http://127.0.0.1:8899'
+  }
+  const provider = AnchorProvider.env() as anchor.AnchorProvider
+  provider.opts.skipPreflight = true
+  return { program: getProgram(provider), provider }
+}
diff --git a/packages/validator-bonds-cli/src/index.ts b/packages/validator-bonds-cli/src/index.ts
@@ -20,7 +20,8 @@ program
   .allowExcessArguments(false)
   .option(
     '-u, --cluster <cluster>',
-    'solana cluster URL, accepts shortcuts (d/devnet, m/mainnet) (default: http://localhost:8899)'
+    'solana cluster URL, accepts shortcuts (d/devnet, m/mainnet)',
+    'http://127.0.0.1:8899'
   )
   .option('-c <cluster>', 'alias for "-u, --cluster"')
   .option('--commitment <commitment>', 'Commitment', 'confirmed')

diff --git a/packages/validator-bonds-sdk/__tests__/test-validator/utils.ts b/packages/validator-bonds-sdk/__tests__/test-validator/utils.ts
@@ -6,8 +6,11 @@ export async function initTest(): Promise<{
   program: ValidatorBondsProgram
   provider: AnchorProvider
 }> {
-  anchor.setProvider(anchor.AnchorProvider.env())
-  const provider = anchor.getProvider() as anchor.AnchorProvider
+  if (process.env.ANCHOR_PROVIDER_URL?.includes('localhost')) {
+    // workaround to: https://github.com/coral-xyz/anchor/pull/2725
+    process.env.ANCHOR_PROVIDER_URL = 'http://127.0.0.1:8899'
+  }
+  const provider = AnchorProvider.env() as anchor.AnchorProvider
   provider.opts.skipPreflight = true
   return { program: getProgram(provider), provider }
 }