Skip to content

program: Use macro for conditional logging #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
febo merged 1 commit into from
Jun 2, 2026
Merged

program: Use macro for conditional logging #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions program/src/entrypoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ use pinocchio::{
default_panic_handler, error::ProgramError, no_allocator, program_entrypoint, AccountView,
Address, ProgramResult,
};
#[cfg(feature = "logging")]
use solana_program_log::log;

use crate::{
instruction::ProgramMetadataInstruction,
Expand All @@ -20,6 +18,14 @@ default_panic_handler!();
// No allocator is used.
no_allocator!();

/// Logs a message if the "logging" feature is enabled.
macro_rules! cfg_log {
($msg:literal) => {
#[cfg(feature = "logging")]
solana_program_log::log($msg);
};
}

fn process_instruction(
_program_id: &Address,
accounts: &mut [AccountView],
Expand All @@ -32,65 +38,47 @@ fn process_instruction(
match ProgramMetadataInstruction::try_from(*instruction)? {
// 0 - Write
ProgramMetadataInstruction::Write => {
#[cfg(feature = "logging")]
log("Instruction: Write");

cfg_log!("Instruction: Write");
write(accounts, data)
}
// 1 - Initialize
ProgramMetadataInstruction::Initialize => {
#[cfg(feature = "logging")]
log("Instruction: Initialize");

cfg_log!("Instruction: Initialize");
initialize(accounts, data)
}
// 2 - SetAuthority
ProgramMetadataInstruction::SetAuthority => {
#[cfg(feature = "logging")]
log("Instruction: SetAuthority");

cfg_log!("Instruction: SetAuthority");
set_authority(accounts, data)
}
// 3 - SetData
ProgramMetadataInstruction::SetData => {
#[cfg(feature = "logging")]
log("Instruction: SetData");

cfg_log!("Instruction: SetData");
set_data(accounts, data)
}
// 4 - SetImmutable
ProgramMetadataInstruction::SetImmutable => {
#[cfg(feature = "logging")]
log("Instruction: SetImmutable");

cfg_log!("Instruction: SetImmutable");
set_immutable(accounts)
}
// 5 - Trim
ProgramMetadataInstruction::Trim => {
#[cfg(feature = "logging")]
log("Instruction: Trim");

cfg_log!("Instruction: Trim");
trim(accounts)
}
// 6 - Close
ProgramMetadataInstruction::Close => {
#[cfg(feature = "logging")]
log("Instruction: Close");

cfg_log!("Instruction: Close");
close(accounts)
}
// 7 - Allocate
ProgramMetadataInstruction::Allocate => {
#[cfg(feature = "logging")]
log("Instruction: Allocate");

cfg_log!("Instruction: Allocate");
allocate(accounts, data)
}
// 8 - Extend
ProgramMetadataInstruction::Extend => {
#[cfg(feature = "logging")]
log("Instruction: Extend");

cfg_log!("Instruction: Extend");
extend(accounts, data)
}
}
Expand Down
Loading