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

fix: remove return value from load, unnecessary

Browse Source
This commit is contained in:
Jack May
2020-05-20 11:57:51 -07:00
committed by Michael Vines
parent 6b0c4bf17f
commit f02e73cd5e
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ export class BpfLoader {
payer: Account, payer: Account,
program: Account, program: Account,
elf: Buffer | Uint8Array | Array<number>, elf: Buffer | Uint8Array | Array<number>,
): Promise<PublicKey> { ): Promise<void> {
return Loader.load(connection, payer, program, BpfLoader.programId, elf); return Loader.load(connection, payer, program, BpfLoader.programId, elf);
} }
} }

3
web3.js/src/loader.js
View File

@ -53,7 +53,7 @@ export class Loader {
program: Account, program: Account,
programId: PublicKey, programId: PublicKey,
data: Buffer | Uint8Array | Array<number>, data: Buffer | Uint8Array | Array<number>,
): Promise<PublicKey> { ): Promise<void> {
{ {
const balanceNeeded = await connection.getMinimumBalanceForRentExemption( const balanceNeeded = await connection.getMinimumBalanceForRentExemption(
data.length, data.length,
@ -145,6 +145,5 @@ export class Loader {
}); });
await sendAndConfirmTransaction(connection, transaction, payer, program); await sendAndConfirmTransaction(connection, transaction, payer, program);
} }
return program.publicKey;
} }
} }

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

@ -39,10 +39,10 @@ test('load BPF C program', async () => {
const from = await newAccountWithLamports(connection, fees + balanceNeeded); const from = await newAccountWithLamports(connection, fees + balanceNeeded);
const program = new Account(); const program = new Account();
const programId = await BpfLoader.load(connection, from, program, data); await BpfLoader.load(connection, from, program, data);
const transaction = new Transaction().add({ const transaction = new Transaction().add({
keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}], keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}],
programId, programId: program.publicKey,
}); });
await sendAndConfirmTransaction(connection, transaction, from); await sendAndConfirmTransaction(connection, transaction, from);
}); });
@ -68,10 +68,10 @@ test('load BPF Rust program', async () => {
const from = await newAccountWithLamports(connection, fees + balanceNeeded); const from = await newAccountWithLamports(connection, fees + balanceNeeded);
const program = new Account(); const program = new Account();
const programId = await BpfLoader.load(connection, from, program, data); await BpfLoader.load(connection, from, program, data);
const transaction = new Transaction().add({ const transaction = new Transaction().add({
keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}], keys: [{pubkey: from.publicKey, isSigner: true, isWritable: true}],
programId, programId: program.publicKey,
}); });
await sendAndConfirmTransaction(connection, transaction, from); await sendAndConfirmTransaction(connection, transaction, from);
}); });