fix: update tests to use pythnet/pythtest

src/__tests__/Anchor.test.ts

@@ -1,16 +1,17 @@
 import { AnchorProvider, Wallet } from '@coral-xyz/anchor'
 import { Connection, Keypair, PublicKey } from '@solana/web3.js'
 import { BN } from 'bn.js'
+import { getPythClusterApiUrl } from '../cluster'
 import { getPythProgramKeyForCluster, pythOracleProgram, pythOracleCoder } from '../index'
 
 test('Anchor', (done) => {
   jest.setTimeout(60000)
   const provider = new AnchorProvider(
-    new Connection('https://api.mainnet-beta.solana.com'),
+    new Connection(getPythClusterApiUrl('pythnet')),
     new Wallet(new Keypair()),
     AnchorProvider.defaultOptions(),
   )
-  const pythOracle = pythOracleProgram(getPythProgramKeyForCluster('mainnet-beta'), provider)
+  const pythOracle = pythOracleProgram(getPythProgramKeyForCluster('pythnet'), provider)
   pythOracle.methods
     .initMapping()
     .accounts({ fundingAccount: PublicKey.unique(), freshMappingAccount: PublicKey.unique() })

src/__tests__/Example.test.ts

@@ -1,7 +1,7 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { parseMappingData, parsePriceData, parseProductData } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl, parseMappingData, parsePriceData, parseProductData } from '../index'
 
-const SOLANA_CLUSTER_URL = clusterApiUrl('devnet')
+const SOLANA_CLUSTER_URL = getPythClusterApiUrl('pythtest-crosschain')
 const ORACLE_MAPPING_PUBLIC_KEY = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
 
 test('Mapping', (done) => {

src/__tests__/Mapping.test.ts

@@ -1,9 +1,9 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { parseMappingData, Magic, Version } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { parseMappingData, Magic, Version, getPythClusterApiUrl } from '../index'
 
 test('Mapping', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)

src/__tests__/Price.test.ts

@@ -1,5 +1,6 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
+import { Connection, PublicKey } from '@solana/web3.js'
 import {
+  getPythClusterApiUrl,
   Magic,
   MAX_SLOT_DIFFERENCE,
   parseMappingData,
@@ -11,7 +12,7 @@ import {
 
 test('Price', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)

src/__tests__/Product.ETH.test.ts

@@ -1,9 +1,9 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
-import { Magic, parseProductData, Version } from '../index'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl, Magic, parseProductData, Version } from '../index'
 
 test('Product', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const ethProductKey = '2ciUuGZiee5macAMeQ7bHGTJtwcYTgnt6jdmQnnKZrfu'
   const connection = new Connection(url)
   const publicKey = new PublicKey(ethProductKey)

src/__tests__/Product.test.ts

@@ -1,9 +1,10 @@
-import { clusterApiUrl, Connection, PublicKey } from '@solana/web3.js'
+import { Connection, PublicKey } from '@solana/web3.js'
+import { getPythClusterApiUrl } from '../cluster'
 import { parseMappingData, parseProductData, Magic, Version } from '../index'
 
 test('Product', (done) => {
   jest.setTimeout(60000)
-  const url = clusterApiUrl('devnet')
+  const url = getPythClusterApiUrl('pythtest-crosschain')
   const oraclePublicKey = 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2'
   const connection = new Connection(url)
   const publicKey = new PublicKey(oraclePublicKey)

src/__tests__/PythNetworkRestClient.test.ts

@@ -1,11 +1,12 @@
-import { clusterApiUrl, Connection, PublicKey, SystemProgram } from '@solana/web3.js'
+import { Connection, PublicKey, SystemProgram } from '@solana/web3.js'
 import { getPythProgramKeyForCluster, parseProductData, PythHttpClient } from '..'
+import { getPythClusterApiUrl } from '../cluster'
 
 test('PythHttpClientCall: getData', (done) => {
-  jest.setTimeout(20000)
+  jest.setTimeout(60000)
   try {
-    const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const programKey = getPythProgramKeyForCluster('pythtest-conformance')
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client.getData().then(
       (result) => {
@@ -30,7 +31,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts for one account', (done) =>
   const solUSDKey = new PublicKey('7VJsBtJzgTftYzEeooSDYyjKXvYRWJHdwvbwfBvTg9K')
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey])
@@ -66,7 +67,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts for multiple accounts', (do
 
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey, bonkUSDKey, usdcUSDKey])
@@ -106,7 +107,7 @@ test('PythHttpClientCall: getAssetPricesFromAccounts should throw for invalid ac
 
   try {
     const programKey = getPythProgramKeyForCluster('testnet')
-    const currentConnection = new Connection(clusterApiUrl('testnet'))
+    const currentConnection = new Connection(getPythClusterApiUrl('pythtest-conformance'))
     const pyth_client = new PythHttpClient(currentConnection, programKey)
     pyth_client
       .getAssetPricesFromAccounts([solUSDKey, systemProgram, usdcUSDKey])

src/cluster.ts

@@ -32,7 +32,7 @@ export function getPythClusterApiUrl(cluster: PythCluster): string {
   if (cluster === 'pythtest-conformance' || cluster === 'pythtest-crosschain') {
     return 'https://api.pythtest.pyth.network'
   } else if (cluster === 'pythnet') {
-    return 'https://pythnet.rpcpool.com'
+    return 'https://api2.pythnet.pyth.network'
   } else if (cluster === 'localnet') {
     return 'http://localhost:8899'
   } else {