blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: adjust notification test to wait for the next block

This commit is contained in:
Michael Vines 2019-03-05 10:07:50 -08:00
parent f655c30159
commit 5d350b4568
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web3.js/test/connection.test.js
View File

@ -7,6 +7,7 @@ import {
SystemProgram, SystemProgram,
sendAndConfirmTransaction, sendAndConfirmTransaction,
} from '../src'; } from '../src';
import {DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND} from '../src/timing';
import {mockRpc, mockRpcEnabled} from './__mocks__/node-fetch'; import {mockRpc, mockRpcEnabled} from './__mocks__/node-fetch';
import {mockGetRecentBlockhash} from './mockrpc/get-recent-blockhash'; import {mockGetRecentBlockhash} from './mockrpc/get-recent-blockhash';
import {url} from './url'; import {url} from './url';
@ -114,7 +115,7 @@ test('get transaction count', async () => {
expect(count).toBeGreaterThanOrEqual(0); expect(count).toBeGreaterThanOrEqual(0);
}); });
test('get last Id', async () => { test('get recent blockhash', async () => {
const connection = new Connection(url); const connection = new Connection(url);
mockGetRecentBlockhash(); mockGetRecentBlockhash();
@ -450,12 +451,10 @@ test('account change notification', async () => {
const loader = new Loader(connection, BpfLoader.programId); const loader = new Loader(connection, BpfLoader.programId);
await loader.load(programAccount, [1, 2, 3]); await loader.load(programAccount, [1, 2, 3]);
// mockCallback should be called twice // Wait for mockCallback to receive a call
//
// retry a couple times if needed
let i = 0; let i = 0;
for (;;) { for (;;) {
if (mockCallback.mock.calls.length === 2) { if (mockCallback.mock.calls.length === 1) {
break; break;
} }
@ -463,21 +462,17 @@ test('account change notification', async () => {
console.log(JSON.stringify(mockCallback.mock.calls)); console.log(JSON.stringify(mockCallback.mock.calls));
throw new Error('mockCallback should be called twice'); throw new Error('mockCallback should be called twice');
} }
await sleep(500); // Sleep for a 1/4 of a slot, notifications only occur after a block is
// processed
await sleep((250 * DEFAULT_TICKS_PER_SLOT) / NUM_TICKS_PER_SECOND);
} }
await connection.removeAccountChangeListener(subscriptionId); await connection.removeAccountChangeListener(subscriptionId);
// First mockCallback call is due to SystemProgram.createAccount() expect(mockCallback.mock.calls[0][0].tokens).toBe(41);
expect(mockCallback.mock.calls[0][0].tokens).toBe(42); expect(mockCallback.mock.calls[0][0].owner).toEqual(BpfLoader.programId);
expect(mockCallback.mock.calls[0][0].executable).toBe(false); expect(mockCallback.mock.calls[0][0].executable).toBe(false);
expect(mockCallback.mock.calls[0][0].userdata).toEqual( expect(mockCallback.mock.calls[0][0].userdata).toEqual(
Buffer.from([0, 0, 0]),
);
expect(mockCallback.mock.calls[0][0].owner).toEqual(BpfLoader.programId);
// Second mockCallback call is due to loader.load()
expect(mockCallback.mock.calls[1][0].userdata).toEqual(
Buffer.from([1, 2, 3]), Buffer.from([1, 2, 3]),
); );
}); });