Skip to content

Commit

Permalink
bump nightly version
Browse files Browse the repository at this point in the history
  • Loading branch information
buffalojoec committed Oct 29, 2024
1 parent 2e888b4 commit 8a23bc3
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 154 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ members = ["clients/rust", "program"]
solana = "2.0.2"

[workspace.metadata.toolchains]
format = "nightly-2023-10-05"
lint = "nightly-2023-10-05"
format = "nightly-2024-05-02"
lint = "nightly-2024-05-02"
9 changes: 0 additions & 9 deletions clients/js/src/generated/errors/index.ts

This file was deleted.

51 changes: 0 additions & 51 deletions clients/js/src/generated/errors/loaderV4.ts

This file was deleted.

1 change: 0 additions & 1 deletion clients/js/src/generated/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
* @see https://github.com/kinobi-so/kinobi
*/

export * from './errors';
export * from './instructions';
export * from './programs';
20 changes: 0 additions & 20 deletions clients/rust/src/generated/errors/loader_v4.rs

This file was deleted.

4 changes: 0 additions & 4 deletions clients/rust/src/generated/errors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@
//! to add features, then rerun kinobi to update it.
//!
//! <https://github.com/kinobi-so/kinobi>
pub(crate) mod loader_v4;

pub use self::loader_v4::LoaderV4Error;
7 changes: 0 additions & 7 deletions program/idl.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,6 @@
}
}
],
"errors": [
{
"code": 0,
"name": "Placeholder",
"msg": "This is a placeholder error"
}
],
"metadata": {
"origin": "shank",
"address": "CoreBPFLoaderV41111111111111111111111111111",
Expand Down
13 changes: 3 additions & 10 deletions program/src/entrypoint.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
//! Program entrypoint.
use {
crate::{error::LoaderV4Error, processor},
solana_program::{
account_info::AccountInfo, entrypoint::ProgramResult, program_error::PrintProgramError,
pubkey::Pubkey,
},
crate::processor,
solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey},
};

solana_program::entrypoint!(process_instruction);
Expand All @@ -15,9 +12,5 @@ fn process_instruction(
accounts: &[AccountInfo],
input: &[u8],
) -> ProgramResult {
if let Err(error) = processor::process(program_id, accounts, input) {
error.print::<LoaderV4Error>();
return Err(error);
}
Ok(())
processor::process(program_id, accounts, input)
}
37 changes: 0 additions & 37 deletions program/src/error.rs

This file was deleted.

1 change: 0 additions & 1 deletion program/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#[cfg(all(target_os = "solana", feature = "bpf-entrypoint"))]
mod entrypoint;
pub mod error;
pub mod instruction;
pub mod processor;
pub mod state;
Expand Down
8 changes: 4 additions & 4 deletions program/tests/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_058),
Check::compute_units(1_057),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down Expand Up @@ -286,7 +286,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_058),
Check::compute_units(1_057),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down Expand Up @@ -568,7 +568,7 @@ fn success_source_program() {
],
&[
Check::success(),
Check::compute_units(2_122),
Check::compute_units(2_121),
Check::account(&program).data(&check_data).build(),
Check::account(&source).data(&[]).build(),
],
Expand Down Expand Up @@ -610,7 +610,7 @@ fn success_source_program() {
],
&[
Check::success(),
Check::compute_units(2_049),
Check::compute_units(2_048),
Check::account(&program).data(&check_data).build(),
Check::account(&source).data(&[]).build(),
],
Expand Down
2 changes: 1 addition & 1 deletion program/tests/finalize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(967),
Check::compute_units(966),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down
2 changes: 1 addition & 1 deletion program/tests/retract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_011),
Check::compute_units(1_010),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down
2 changes: 1 addition & 1 deletion program/tests/transfer_authority.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_036),
Check::compute_units(1_035),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down
6 changes: 3 additions & 3 deletions program/tests/truncate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ fn success_initialization() {
],
&[
Check::success(),
Check::compute_units(1_122),
Check::compute_units(1_121),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down Expand Up @@ -463,7 +463,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_218),
Check::compute_units(1_217),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down Expand Up @@ -496,7 +496,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_466),
Check::compute_units(1_465),
Check::account(&program).data(&check_data).build(),
Check::account(&destination)
.lamports(expected_destination_lamports)
Expand Down
4 changes: 2 additions & 2 deletions program/tests/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_039),
Check::compute_units(1_038),
Check::account(&program).data(&check_data).build(),
],
);
Expand All @@ -248,7 +248,7 @@ fn success() {
],
&[
Check::success(),
Check::compute_units(1_193),
Check::compute_units(1_192),
Check::account(&program).data(&check_data).build(),
],
);
Expand Down

0 comments on commit 8a23bc3

Please sign in to comment.