fix: better handling if confirmed block not found on node

This commit is contained in:
Tyera Eulberg
2020-01-22 13:05:19 -07:00
committed by Michael Vines
parent 43e90a1967
commit 3482953757
2 changed files with 58 additions and 37 deletions

View File

@ -448,6 +448,8 @@ const GetMinimumBalanceForRentExemptionRpcResult = jsonRpcResult('number');
* Expected JSON RPC response for the "getConfirmedBlock" message * Expected JSON RPC response for the "getConfirmedBlock" message
*/ */
export const GetConfirmedBlockRpcResult = jsonRpcResult( export const GetConfirmedBlockRpcResult = jsonRpcResult(
struct.union([
'null',
struct({ struct({
blockhash: 'string', blockhash: 'string',
previousBlockhash: 'string', previousBlockhash: 'string',
@ -488,6 +490,7 @@ export const GetConfirmedBlockRpcResult = jsonRpcResult(
}), }),
]), ]),
}), }),
]),
); );
/** /**
@ -1052,6 +1055,9 @@ export class Connection {
throw new Error(result.error.message); throw new Error(result.error.message);
} }
assert(typeof result.result !== 'undefined'); assert(typeof result.result !== 'undefined');
if (!result.result) {
throw new Error('Confirmed block '+slot+' not found');
}
return { return {
blockhash: new PublicKey(result.result.blockhash).toString(), blockhash: new PublicKey(result.result.blockhash).toString(),
previousBlockhash: new PublicKey( previousBlockhash: new PublicKey(

View File

@ -646,6 +646,21 @@ test('get confirmed block', async () => {
} }
x++; x++;
} }
mockRpc.push([
url,
{
method: 'getConfirmedBlock',
params: [10000],
},
{
error: null,
result: null,
},
]);
await expect(
connection.getConfirmedBlock(10000),
).rejects.toThrow();
}); });
test('get recent blockhash', async () => { test('get recent blockhash', async () => {