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

fix: add more lamports to payer accounts to account for higher fees

This commit is contained in:
Michael Vines 2019-06-12 10:51:56 -07:00
parent e23d2453d7
commit a8d0b6f9f1
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web3.js/test/bpf-loader.test.js
View File

@ -41,7 +41,7 @@ test('load BPF Rust program', async () => {
} }
const connection = new Connection(url); const connection = new Connection(url);
const from = await newAccountWithLamports(connection, 1024); const from = await newAccountWithLamports(connection, 100000);
const data = await fs.readFile( const data = await fs.readFile(
'test/fixtures/noop-rust/solana_bpf_rust_noop.so', 'test/fixtures/noop-rust/solana_bpf_rust_noop.so',
); );

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

@ -319,7 +319,7 @@ test('transaction', async () => {
url, url,
{ {
method: 'requestAirdrop', method: 'requestAirdrop',
params: [accountFrom.publicKey.toBase58(), 12], params: [accountFrom.publicKey.toBase58(), 100010],
}, },
{ {
error: null, error: null,
@ -335,11 +335,11 @@ test('transaction', async () => {
}, },
{ {
error: null, error: null,
result: 12, result: 100010,
}, },
]); ]);
await connection.requestAirdrop(accountFrom.publicKey, 12); await connection.requestAirdrop(accountFrom.publicKey, 100010);
expect(await connection.getBalance(accountFrom.publicKey)).toBe(12); expect(await connection.getBalance(accountFrom.publicKey)).toBe(100010);
mockRpc.push([ mockRpc.push([
url, url,
@ -406,7 +406,7 @@ test('transaction', async () => {
if (await connection.confirmTransaction(signature)) { if (await connection.confirmTransaction(signature)) {
break; break;
} }
console.log('not confirmed', signature);
expect(mockRpcEnabled).toBe(false); expect(mockRpcEnabled).toBe(false);
expect(++i).toBeLessThan(10); expect(++i).toBeLessThan(10);
await sleep(500); await sleep(500);
@ -441,10 +441,10 @@ test('transaction', async () => {
}, },
]); ]);
// accountFrom may have less than 2 due to transaction fees // accountFrom may have less than 100000 due to transaction fees
const balance = await connection.getBalance(accountFrom.publicKey); const balance = await connection.getBalance(accountFrom.publicKey);
expect(balance).toBeGreaterThan(0); expect(balance).toBeGreaterThan(0);
expect(balance).toBeLessThanOrEqual(2); expect(balance).toBeLessThanOrEqual(100000);
mockRpc.push([ mockRpc.push([
url, url,
@ -470,8 +470,8 @@ test('multi-instruction transaction', async () => {
const accountTo = new Account(); const accountTo = new Account();
const connection = new Connection(url); const connection = new Connection(url);
await connection.requestAirdrop(accountFrom.publicKey, 12); await connection.requestAirdrop(accountFrom.publicKey, 100000);
expect(await connection.getBalance(accountFrom.publicKey)).toBe(12); expect(await connection.getBalance(accountFrom.publicKey)).toBe(100000);
await connection.requestAirdrop(accountTo.publicKey, 21); await connection.requestAirdrop(accountTo.publicKey, 21);
expect(await connection.getBalance(accountTo.publicKey)).toBe(21); expect(await connection.getBalance(accountTo.publicKey)).toBe(21);
@ -481,8 +481,8 @@ test('multi-instruction transaction', async () => {
const transaction = SystemProgram.transfer( const transaction = SystemProgram.transfer(
accountFrom.publicKey, accountFrom.publicKey,
accountTo.publicKey, accountTo.publicKey,
10, 100,
).add(SystemProgram.transfer(accountTo.publicKey, accountFrom.publicKey, 10)); ).add(SystemProgram.transfer(accountTo.publicKey, accountFrom.publicKey, 100));
const signature = await connection.sendTransaction( const signature = await connection.sendTransaction(
transaction, transaction,
accountFrom, accountFrom,
@ -502,11 +502,11 @@ test('multi-instruction transaction', async () => {
Ok: null, Ok: null,
}); });
// accountFrom may have less than 12 due to transaction fees // accountFrom may have less than 100000 due to transaction fees
expect(await connection.getBalance(accountFrom.publicKey)).toBeGreaterThan(0); expect(await connection.getBalance(accountFrom.publicKey)).toBeGreaterThan(0);
expect( expect(
await connection.getBalance(accountFrom.publicKey), await connection.getBalance(accountFrom.publicKey),
).toBeLessThanOrEqual(12); ).toBeLessThanOrEqual(100000);
expect(await connection.getBalance(accountTo.publicKey)).toBe(21); expect(await connection.getBalance(accountTo.publicKey)).toBe(21);
}); });
@ -528,7 +528,7 @@ test('account change notification', async () => {
mockCallback, mockCallback,
); );
await connection.requestAirdrop(owner.publicKey, 42); await connection.requestAirdrop(owner.publicKey, 100000);
await Loader.load(connection, owner, programAccount, BpfLoader.programId, [ await Loader.load(connection, owner, programAccount, BpfLoader.programId, [
1, 1,
2, 2,
@ -582,7 +582,7 @@ test('program account change notification', async () => {
}, },
); );
await connection.requestAirdrop(owner.publicKey, 42); await connection.requestAirdrop(owner.publicKey, 100000);
await Loader.load(connection, owner, programAccount, BpfLoader.programId, [ await Loader.load(connection, owner, programAccount, BpfLoader.programId, [
1, 1,
2, 2,