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

Remove the 5 integer msg! form

Browse Source
This commit is contained in:
Michael Vines
2021-12-10 13:13:30 -08:00
parent eeb97fe7ce
commit c5c699a918
8 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sdk/program/src/log.rs
View File

@ -21,12 +21,10 @@ macro_rules! info {
/// Print a message to the log
///
/// There are two fast forms:
/// Fast form:
/// 1. Single string: `msg!("hi")`
/// 2. 5 integers: `msg!(1, 2, 3, 4, 5)`
///
/// The third form is more generic and incurs a very large runtime overhead so it should be used
/// with care:
/// The generic form incurs a very large runtime overhead so it should be used with care:
/// 3. Generalized format string: `msg!("Hello {}: 1, 2, {}", "World", 3)`
///
#[macro_export]
@ -34,15 +32,6 @@ macro_rules! msg {
($msg:expr) => {
$crate::log::sol_log($msg)
};
($arg1:expr, $arg2:expr, $arg3:expr, $arg4:expr, $arg5:expr) => {
$crate::log::sol_log_64(
$arg1 as u64,
$arg2 as u64,
$arg3 as u64,
$arg4 as u64,
$arg5 as u64,
)
};
($($arg:tt)*) => ($crate::log::sol_log(&format!($($arg)*)));
}
@ -108,7 +97,7 @@ pub fn sol_log_data(data: &[&[u8]]) {
#[allow(dead_code)]
pub fn sol_log_slice(slice: &[u8]) {
for (i, s) in slice.iter().enumerate() {
msg!(0, 0, 0, i, *s);
sol_log_64(0, 0, 0, i as u64, *s as u64);
}
}
@ -120,15 +109,15 @@ pub fn sol_log_slice(slice: &[u8]) {
pub fn sol_log_params(accounts: &[AccountInfo], data: &[u8]) {
for (i, account) in accounts.iter().enumerate() {
msg!("AccountInfo");
msg!(0, 0, 0, 0, i);
sol_log_64(0, 0, 0, 0, i as u64);
msg!("- Is signer");
msg!(0, 0, 0, 0, account.is_signer);
sol_log_64(0, 0, 0, 0, account.is_signer as u64);
msg!("- Key");
account.key.log();
msg!("- Lamports");
msg!(0, 0, 0, 0, account.lamports());
sol_log_64(0, 0, 0, 0, account.lamports());
msg!("- Account data length");
msg!(0, 0, 0, 0, account.data_len());
sol_log_64(0, 0, 0, 0, account.data_len() as u64);
msg!("- Owner");
account.owner.log();
}