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

fix: adapt test to slower slot rate

This commit is contained in:
Michael Vines 2019-03-05 10:20:45 -08:00
parent 5d350b4568
commit b9e3598a51
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web3.js/test/token-program.test.js
View File

@ -10,7 +10,7 @@ import {sleep} from '../src/util/sleep';
if (!mockRpcEnabled) { if (!mockRpcEnabled) {
// The default of 5 seconds is too slow for live testing sometimes // The default of 5 seconds is too slow for live testing sometimes
jest.setTimeout(15000); jest.setTimeout(20000);
} }
function mockGetSignatureStatus(result: string = 'Confirmed') { function mockGetSignatureStatus(result: string = 'Confirmed') {
@ -59,18 +59,15 @@ test('create new token', async () => {
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock Token.newAccount() transaction // mock Token.newAccount() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus('SignatureNotFound'); mockGetSignatureStatus('SignatureNotFound');
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock SystemProgram.createAccount transaction for Token.createNewToken() // mock SystemProgram.createAccount transaction for Token.createNewToken()
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock Token.createNewToken() transaction // mock Token.createNewToken() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus('SignatureNotFound'); mockGetSignatureStatus('SignatureNotFound');
mockGetSignatureStatus(); mockGetSignatureStatus();
@ -233,12 +230,10 @@ test('create new token account', async () => {
{ {
// mock SystemProgram.createAccount transaction for Token.newAccount() // mock SystemProgram.createAccount transaction for Token.newAccount()
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock Token.newAccount() transaction // mock Token.newAccount() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -292,12 +287,10 @@ test('transfer', async () => {
{ {
// mock SystemProgram.createAccount transaction for Token.newAccount() // mock SystemProgram.createAccount transaction for Token.newAccount()
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock Token.newAccount() transaction // mock Token.newAccount() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -337,7 +330,6 @@ test('transfer', async () => {
]); ]);
// mock Token.transfer() transaction // mock Token.transfer() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -390,12 +382,10 @@ test('approve/revoke', async () => {
{ {
// mock SystemProgram.createAccount transaction for Token.newAccount() // mock SystemProgram.createAccount transaction for Token.newAccount()
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
// mock Token.newAccount() transaction // mock Token.newAccount() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -406,7 +396,6 @@ test('approve/revoke', async () => {
{ {
// mock Token.approve() transaction // mock Token.approve() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -474,7 +463,6 @@ test('approve/revoke', async () => {
{ {
// mock Token.revoke() transaction // mock Token.revoke() transaction
mockGetRecentBlockhash();
mockSendTransaction(); mockSendTransaction();
mockGetSignatureStatus(); mockGetSignatureStatus();
} }
@ -542,7 +530,6 @@ test('invalid approve', async () => {
} }
const connection = new Connection(url); const connection = new Connection(url);
connection._disableBlockhashCaching = mockRpcEnabled;
const owner = await newAccountWithTokens(connection); const owner = await newAccountWithTokens(connection);
const account1 = await testToken.newAccount(owner); const account1 = await testToken.newAccount(owner);
@ -567,7 +554,6 @@ test('fail on approve overspend', async () => {
} }
const connection = new Connection(url); const connection = new Connection(url);
connection._disableBlockhashCaching = mockRpcEnabled;
const owner = await newAccountWithTokens(connection); const owner = await newAccountWithTokens(connection);
const account1 = await testToken.newAccount(owner); const account1 = await testToken.newAccount(owner);
@ -611,7 +597,6 @@ test('set owner', async () => {
} }
const connection = new Connection(url); const connection = new Connection(url);
connection._disableBlockhashCaching = mockRpcEnabled;
const owner = await newAccountWithTokens(connection); const owner = await newAccountWithTokens(connection);
const newOwner = await newAccountWithTokens(connection); const newOwner = await newAccountWithTokens(connection);
@ -623,7 +608,4 @@ test('set owner', async () => {
).rejects.toThrow(); ).rejects.toThrow();
await testToken.setOwner(newOwner, account, owner.publicKey); await testToken.setOwner(newOwner, account, owner.publicKey);
await expect(
testToken.setOwner(newOwner, account, owner.publicKey),
).rejects.toThrow();
}); });