diff --git a/web3.js/test/account.test.ts b/web3.js/test/account.test.ts index 991c1ae9e72abc..8d9eb1ee4dd122 100644 --- a/web3.js/test/account.test.ts +++ b/web3.js/test/account.test.ts @@ -1,5 +1,6 @@ import {expect} from 'chai'; import {Buffer} from 'buffer'; +import { describe } from 'mocha'; import {Account} from '../src/account'; diff --git a/web3.js/test/bpf-loader.test.ts b/web3.js/test/bpf-loader.test.ts index ee40d17e177327..c777d9cb5c83df 100644 --- a/web3.js/test/bpf-loader.test.ts +++ b/web3.js/test/bpf-loader.test.ts @@ -1,5 +1,6 @@ import fs from 'mz/fs'; import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import { @@ -12,6 +13,7 @@ import { import {url} from './url'; import {BPF_LOADER_PROGRAM_ID} from '../src/bpf-loader'; import {helpers} from './mocks/rpc-http'; +import { fail } from 'assert'; use(chaiAsPromised); @@ -160,10 +162,15 @@ if (process.env.TEST_LIVE) { ]) ).value; const expectedReturnData = new Uint8Array([1, 2, 3]); - var decodedData = Buffer.from(returnData.data[0], returnData.data[1]); - expect(err).to.be.null; - expect(returnData.programId).to.eql(program.publicKey.toString()); - expect(decodedData).to.eql(expectedReturnData); + + if (returnData) { + var decodedData = Buffer.from(returnData.data[0], returnData.data[1]); + expect(err).to.be.null; + expect(returnData.programId).to.eql(program.publicKey.toString()); + expect(decodedData).to.eql(expectedReturnData); + } else { + fail("return data must be defined!"); + } }); it('deprecated - simulate transaction without signature verification', async () => { diff --git a/web3.js/test/cluster.test.ts b/web3.js/test/cluster.test.ts index 8acf6c370706a0..39966c27ec5157 100644 --- a/web3.js/test/cluster.test.ts +++ b/web3.js/test/cluster.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {clusterApiUrl} from '../src/utils/cluster'; diff --git a/web3.js/test/connection-subscriptions.test.ts b/web3.js/test/connection-subscriptions.test.ts index f55b6a8d673420..db5bba8a94fce4 100644 --- a/web3.js/test/connection-subscriptions.test.ts +++ b/web3.js/test/connection-subscriptions.test.ts @@ -1,4 +1,5 @@ import chai from 'chai'; +import { describe } from 'mocha'; import {Client} from 'rpc-websockets'; import {stub, SinonStubbedInstance, SinonSpy, spy} from 'sinon'; import sinonChai from 'sinon-chai'; diff --git a/web3.js/test/connection.test.ts b/web3.js/test/connection.test.ts index 08e0383114f7c9..a549358c49ad0a 100644 --- a/web3.js/test/connection.test.ts +++ b/web3.js/test/connection.test.ts @@ -2,10 +2,10 @@ import bs58 from 'bs58'; import {Buffer} from 'buffer'; import * as splToken from '@solana/spl-token'; import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import {Agent as HttpAgent} from 'http'; import {Agent as HttpsAgent} from 'https'; -import {AbortController} from 'node-abort-controller'; import {match, mock, spy, useFakeTimers, SinonFakeTimers} from 'sinon'; import sinonChai from 'sinon-chai'; @@ -75,6 +75,7 @@ import type { import {VersionedTransaction} from '../src/transaction/versioned'; import {MessageV0} from '../src/message/v0'; import {encodeData} from '../src/instruction'; +import { fail } from 'assert'; use(chaiAsPromised); use(sinonChai); @@ -171,10 +172,16 @@ describe('Connection', function () { it('should allow middleware to augment request', async () => { let connection = new Connection(url, { fetchMiddleware: (url, options, fetch) => { - options.headers = Object.assign(options.headers, { - Authorization: 'Bearer 123', - }); - fetch(url, options); + if (options) { + options.headers = Object.assign(options.headers!, { + Authorization: 'Bearer 123', + }); + + fetch(url, options); + + } else { + fail("options must be defined!"); + } }, }); @@ -254,7 +261,7 @@ describe('Connection', function () { it('should not attribute fetch errors to the middleware', async () => { let connection = new Connection(url, { fetchMiddleware: (url, _options, fetch) => { - fetch(url, 'An `Object` was expected here; this is a `TypeError`.'); + fetch(url, {'body': 'An `Object` was expected here; this is a `TypeError`.'}); }, }); const error = await expect(connection.getVersion()).to.be.rejected; @@ -1334,7 +1341,8 @@ describe('Connection', function () { const mockSignature = 'LPJ18iiyfz3G1LpNNbcBnBtaS4dVBdPHKrnELqikjER2DcvB4iyTgz43nKQJH3JQAJHuZdM1xVh5Cnc5Hc7LrqC'; - let resolveResultPromise: (result: SignatureResult) => void; + let resolveResultPromise = function(result: SignatureResult): void {}; + await mockRpcMessage({ method: 'signatureSubscribe', params: [mockSignature, {commitment: 'finalized'}], @@ -1344,7 +1352,7 @@ describe('Connection', function () { }); // Simulate a failure to fetch the block height. - let rejectBlockheightPromise: () => void; + let rejectBlockheightPromise = function(): void {}; await mockRpcResponse({ method: 'getBlockHeight', params: [], @@ -1375,7 +1383,7 @@ describe('Connection', function () { const mockSignature = 'LPJ18iiyfz3G1LpNNbcBnBtaS4dVBdPHKrnELqikjER2DcvB4iyTgz43nKQJH3JQAJHuZdM1xVh5Cnc5Hc7LrqC'; - let resolveResultPromise: (result: SignatureResult) => void; + let resolveResultPromise = function(result: SignatureResult): void {}; await mockRpcMessage({ method: 'signatureSubscribe', params: [mockSignature, {commitment: 'finalized'}], @@ -1455,7 +1463,7 @@ describe('Connection', function () { const mockSignature = '4oCEqwGrMdBeMxpzuWiukCYqSfV4DsSKXSiVVCh1iJ6pS772X7y219JZP3mgqBz5PhsvprpKyhzChjYc3VSBQXzG'; - let resolveResultPromise: (result: SignatureResult) => void; + let resolveResultPromise= function(result: SignatureResult): void {}; await mockRpcMessage({ method: 'signatureSubscribe', params: [mockSignature, {commitment: 'finalized'}], @@ -1666,7 +1674,7 @@ describe('Connection', function () { const mockSignature = 'LPJ18iiyfz3G1LpNNbcBnBtaS4dVBdPHKrnELqikjER2DcvB4iyTgz43nKQJH3JQAJHuZdM1xVh5Cnc5Hc7LrqC'; - let resolveResultPromise: (result: SignatureResult) => void; + let resolveResultPromise = function(result: SignatureResult): void {}; await mockRpcMessage({ method: 'signatureSubscribe', params: [mockSignature, {commitment: 'finalized'}], @@ -1676,7 +1684,7 @@ describe('Connection', function () { }); // Simulate a failure to fetch the nonce account. - let rejectNonceAccountFetchPromise: () => void; + let rejectNonceAccountFetchPromise = function(): void {}; await mockRpcResponse({ method: 'getAccountInfo', params: [], @@ -1762,7 +1770,7 @@ describe('Connection', function () { const mockSignature = 'LPJ18iiyfz3G1LpNNbcBnBtaS4dVBdPHKrnELqikjER2DcvB4iyTgz43nKQJH3JQAJHuZdM1xVh5Cnc5Hc7LrqC'; - let resolveResultPromise: (result: SignatureResult) => void; + let resolveResultPromise = function(result: SignatureResult): void {}; await mockRpcMessage({ method: 'signatureSubscribe', params: [mockSignature, {commitment: 'finalized'}], @@ -5391,9 +5399,9 @@ describe('Connection', function () { ); await connection.confirmTransaction({ - blockhash: transaction.recentBlockhash, - lastValidBlockHeight: transaction.lastValidBlockHeight, - signature, + blockhash: transaction.recentBlockhash!, + lastValidBlockHeight: transaction.lastValidBlockHeight!, + signature: signature, }); const response = (await connection.getSignatureStatus(signature)).value; diff --git a/web3.js/test/epoch-schedule.test.ts b/web3.js/test/epoch-schedule.test.ts index 7ab0d02e9ebca7..bba65b7d101a20 100644 --- a/web3.js/test/epoch-schedule.test.ts +++ b/web3.js/test/epoch-schedule.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {EpochSchedule} from '../src'; diff --git a/web3.js/test/keypair.test.ts b/web3.js/test/keypair.test.ts index 60185d5b845c38..642739ede63948 100644 --- a/web3.js/test/keypair.test.ts +++ b/web3.js/test/keypair.test.ts @@ -1,5 +1,6 @@ import {expect} from 'chai'; import {Buffer} from 'buffer'; +import { describe } from 'mocha'; import {Keypair} from '../src'; diff --git a/web3.js/test/makeWebsocketUrl.test.ts b/web3.js/test/makeWebsocketUrl.test.ts index 4f0c196d52e287..fd4bda2e31b224 100644 --- a/web3.js/test/makeWebsocketUrl.test.ts +++ b/web3.js/test/makeWebsocketUrl.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {makeWebsocketUrl} from '../src/utils/makeWebsocketUrl'; diff --git a/web3.js/test/message-tests/account-keys.test.ts b/web3.js/test/message-tests/account-keys.test.ts index ec132e4d96573a..4603cf4aa74b39 100644 --- a/web3.js/test/message-tests/account-keys.test.ts +++ b/web3.js/test/message-tests/account-keys.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import { MessageAccountKeys, diff --git a/web3.js/test/message-tests/compiled-keys.test.ts b/web3.js/test/message-tests/compiled-keys.test.ts index adca1cefe2407a..8c262f40e3d478 100644 --- a/web3.js/test/message-tests/compiled-keys.test.ts +++ b/web3.js/test/message-tests/compiled-keys.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {CompiledKeyMeta, CompiledKeys} from '../../src/message/compiled-keys'; import {AddressLookupTableAccount} from '../../src/programs'; diff --git a/web3.js/test/message-tests/legacy.test.ts b/web3.js/test/message-tests/legacy.test.ts index 5af60c8cff3131..0d7874502c04bb 100644 --- a/web3.js/test/message-tests/legacy.test.ts +++ b/web3.js/test/message-tests/legacy.test.ts @@ -1,5 +1,6 @@ import bs58 from 'bs58'; import {expect} from 'chai'; +import { describe } from 'mocha'; import {sha256} from '@noble/hashes/sha256'; import {Message} from '../../src/message'; diff --git a/web3.js/test/message-tests/v0.test.ts b/web3.js/test/message-tests/v0.test.ts index 8705f7b0fd098b..b467591f61d383 100644 --- a/web3.js/test/message-tests/v0.test.ts +++ b/web3.js/test/message-tests/v0.test.ts @@ -1,5 +1,6 @@ import bs58 from 'bs58'; import {expect} from 'chai'; +import { describe } from 'mocha'; import {sha256} from '@noble/hashes/sha256'; import { diff --git a/web3.js/test/message-tests/versioned.test.ts b/web3.js/test/message-tests/versioned.test.ts index 1acaf7823b1443..bfd2b2e41386b5 100644 --- a/web3.js/test/message-tests/versioned.test.ts +++ b/web3.js/test/message-tests/versioned.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {VersionedMessage} from '../../src/message'; diff --git a/web3.js/test/mocks/rpc-http.ts b/web3.js/test/mocks/rpc-http.ts index 5156201efbaa7f..ff70135145e6fa 100644 --- a/web3.js/test/mocks/rpc-http.ts +++ b/web3.js/test/mocks/rpc-http.ts @@ -128,7 +128,7 @@ const latestBlockhash = async ({ commitment?: Commitment; }) => { const blockhash = uniqueBlockhash(); - const params = []; + const params: Array = []; if (commitment) { params.push({commitment}); } @@ -154,7 +154,7 @@ const recentBlockhash = async ({ commitment?: Commitment; }) => { const blockhash = uniqueBlockhash(); - const params = []; + const params: Array = []; if (commitment) { params.push({commitment}); } diff --git a/web3.js/test/nonce.test.ts b/web3.js/test/nonce.test.ts index 81d871d0d494c9..cc946ab91700d6 100644 --- a/web3.js/test/nonce.test.ts +++ b/web3.js/test/nonce.test.ts @@ -1,6 +1,7 @@ import bs58 from 'bs58'; import {Buffer} from 'buffer'; import {expect} from 'chai'; +import { describe } from 'mocha'; import { Connection, diff --git a/web3.js/test/program-tests/address-lookup-table.test.ts b/web3.js/test/program-tests/address-lookup-table.test.ts index 5b5d4860529498..b6b29d47b5f9a6 100644 --- a/web3.js/test/program-tests/address-lookup-table.test.ts +++ b/web3.js/test/program-tests/address-lookup-table.test.ts @@ -1,4 +1,5 @@ import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import { diff --git a/web3.js/test/program-tests/compute-budget.test.ts b/web3.js/test/program-tests/compute-budget.test.ts index 1269b96812c5f5..177739374f7371 100644 --- a/web3.js/test/program-tests/compute-budget.test.ts +++ b/web3.js/test/program-tests/compute-budget.test.ts @@ -1,4 +1,5 @@ import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import { diff --git a/web3.js/test/program-tests/ed25519.test.ts b/web3.js/test/program-tests/ed25519.test.ts index 853dae6cf39abc..58e15fb75229f9 100644 --- a/web3.js/test/program-tests/ed25519.test.ts +++ b/web3.js/test/program-tests/ed25519.test.ts @@ -1,4 +1,5 @@ import {Buffer} from 'buffer'; +import { describe } from 'mocha'; import { Connection, diff --git a/web3.js/test/program-tests/secp256k1.test.ts b/web3.js/test/program-tests/secp256k1.test.ts index 50f26c94637e26..9d794bcd06c698 100644 --- a/web3.js/test/program-tests/secp256k1.test.ts +++ b/web3.js/test/program-tests/secp256k1.test.ts @@ -1,5 +1,6 @@ import {Buffer} from 'buffer'; import {keccak_256} from '@noble/hashes/sha3'; +import { describe } from 'mocha'; import { ecdsaSign, diff --git a/web3.js/test/program-tests/stake.test.ts b/web3.js/test/program-tests/stake.test.ts index 15c7625a2b7596..638e4f8886d49a 100644 --- a/web3.js/test/program-tests/stake.test.ts +++ b/web3.js/test/program-tests/stake.test.ts @@ -1,5 +1,6 @@ import {expect, use} from 'chai'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; import { Keypair, diff --git a/web3.js/test/program-tests/system.test.ts b/web3.js/test/program-tests/system.test.ts index cfdca891b398f5..a1f2c50ab197c9 100644 --- a/web3.js/test/program-tests/system.test.ts +++ b/web3.js/test/program-tests/system.test.ts @@ -1,5 +1,6 @@ import {Buffer} from 'buffer'; import {expect} from 'chai'; +import { describe } from 'mocha'; import { Keypair, diff --git a/web3.js/test/program-tests/vote.test.ts b/web3.js/test/program-tests/vote.test.ts index bb8cc57ed6284c..ca9336253fc70d 100644 --- a/web3.js/test/program-tests/vote.test.ts +++ b/web3.js/test/program-tests/vote.test.ts @@ -1,4 +1,5 @@ import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import { diff --git a/web3.js/test/publickey.test.ts b/web3.js/test/publickey.test.ts index bc4b9cb4c3fa38..de9c382b62fdc1 100644 --- a/web3.js/test/publickey.test.ts +++ b/web3.js/test/publickey.test.ts @@ -1,6 +1,7 @@ import BN from 'bn.js'; import {Buffer} from 'buffer'; import {expect, use} from 'chai'; +import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; import {Keypair} from '../src/keypair'; diff --git a/web3.js/test/shortvec-encoding.test.ts b/web3.js/test/shortvec-encoding.test.ts index 68f8415862cdaa..3ec4a945664b84 100644 --- a/web3.js/test/shortvec-encoding.test.ts +++ b/web3.js/test/shortvec-encoding.test.ts @@ -1,4 +1,5 @@ import {expect} from 'chai'; +import { describe } from 'mocha'; import {decodeLength, encodeLength} from '../src/utils/shortvec-encoding'; diff --git a/web3.js/test/transaction-payer.test.ts b/web3.js/test/transaction-payer.test.ts index f4127327ce366a..b921a19d24cdb8 100644 --- a/web3.js/test/transaction-payer.test.ts +++ b/web3.js/test/transaction-payer.test.ts @@ -1,5 +1,6 @@ import base58 from 'bs58'; import {expect} from 'chai'; +import { describe } from 'mocha'; import { Keypair, diff --git a/web3.js/test/transaction-tests/message.test.ts b/web3.js/test/transaction-tests/message.test.ts index ce4937c04374ae..5228214588b7ae 100644 --- a/web3.js/test/transaction-tests/message.test.ts +++ b/web3.js/test/transaction-tests/message.test.ts @@ -1,6 +1,7 @@ import bs58 from 'bs58'; import {expect} from 'chai'; import {sha256} from '@noble/hashes/sha256'; +import { describe } from 'mocha'; import { Transaction, diff --git a/web3.js/test/transaction.test.ts b/web3.js/test/transaction.test.ts index cd9574bb2d8f83..56d32010bdf2cc 100644 --- a/web3.js/test/transaction.test.ts +++ b/web3.js/test/transaction.test.ts @@ -1,6 +1,7 @@ import bs58 from 'bs58'; import {Buffer} from 'buffer'; import {expect} from 'chai'; +import { describe } from 'mocha'; import {Connection} from '../src/connection'; import {Keypair} from '../src/keypair'; diff --git a/web3.js/test/url.ts b/web3.js/test/url.ts index 040b53a7016258..091d20069a075a 100644 --- a/web3.js/test/url.ts +++ b/web3.js/test/url.ts @@ -1,8 +1,14 @@ /** * The connection url to use when running unit tests against a live cluster */ - export const MOCK_PORT = 9999; + +declare var process: { + env: { + TEST_LIVE: string + } +} + export const url = process.env.TEST_LIVE ? 'http://localhost:8899/' : 'http://localhost:9999/'; diff --git a/web3.js/test/validator-info.test.ts b/web3.js/test/validator-info.test.ts index 5bed6c9222c347..03eff5c997cc05 100644 --- a/web3.js/test/validator-info.test.ts +++ b/web3.js/test/validator-info.test.ts @@ -1,5 +1,6 @@ import {Buffer} from 'buffer'; import {expect} from 'chai'; +import { describe } from 'mocha'; import {Keypair} from '../src/keypair'; import {PublicKey} from '../src/publickey'; diff --git a/web3.js/test/websocket.test.ts b/web3.js/test/websocket.test.ts index b1d9a1932fb30b..3c2649ba1b5b2e 100644 --- a/web3.js/test/websocket.test.ts +++ b/web3.js/test/websocket.test.ts @@ -2,6 +2,7 @@ import bs58 from 'bs58'; import {Buffer} from 'buffer'; import {expect, use} from 'chai'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; import {Connection} from '../src'; import {url, wsUrl} from './url';