gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: fix TypeError when confirmed block is not found (#13264)

Browse Source
This commit is contained in:
Justin Starry
2020-10-29 11:23:07 +08:00
committed by GitHub
parent 781b92a8c0
commit bc16b58d75
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web3.js/src/connection.js
View File

@ -2535,10 +2535,11 @@ export class Connection {
*/ */
async getConfirmedBlock(slot: number): Promise<ConfirmedBlock> { async getConfirmedBlock(slot: number): Promise<ConfirmedBlock> {
const unsafeRes = await this._rpcRequest('getConfirmedBlock', [slot]); const unsafeRes = await this._rpcRequest('getConfirmedBlock', [slot]);
const {result, error} = GetConfirmedBlockRpcResult(unsafeRes); const res = GetConfirmedBlockRpcResult(unsafeRes);
if (error) { if (res.error) {
throw new Error('failed to get confirmed block: ' + result.error.message); throw new Error('failed to get confirmed block: ' + res.error.message);
} }
const result = res.result;
assert(typeof result !== 'undefined'); assert(typeof result !== 'undefined');
if (!result) { if (!result) {
throw new Error('Confirmed block ' + slot + ' not found'); throw new Error('Confirmed block ' + slot + ' not found');

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

@ -1120,13 +1120,15 @@ test('get confirmed block', async () => {
params: [Number.MAX_SAFE_INTEGER], params: [Number.MAX_SAFE_INTEGER],
}, },
{ {
error: null, error: {
message: `Block not available for slot ${Number.MAX_SAFE_INTEGER}`,
},
result: null, result: null,
}, },
]); ]);
await expect( await expect(
connection.getConfirmedBlock(Number.MAX_SAFE_INTEGER), connection.getConfirmedBlock(Number.MAX_SAFE_INTEGER),
).rejects.toThrow(); ).rejects.toThrow(`Block not available for slot ${Number.MAX_SAFE_INTEGER}`);
}); });
test('get recent blockhash', async () => { test('get recent blockhash', async () => {