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

Remove dependency on hex (#21567)

Browse Source 
* Remove dependency on `hex`

* Update lock file

* Use `debug_struct` instead of own format

* Share code, add test, and fix rent_epoch spelling

Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
fee1-dead
2021-12-04 11:53:35 +08:00
committed by GitHub
parent e130b2cffc
commit c4a9c8b5e9
8 changed files with 136 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
sdk/program/src/account_info.rs
View File

@ -1,10 +1,11 @@
use {
crate::{
clock::Epoch, program_error::ProgramError, program_memory::sol_memset, pubkey::Pubkey,
clock::Epoch, debug_account_data::*, program_error::ProgramError,
program_memory::sol_memset, pubkey::Pubkey,
},
std::{
cell::{Ref, RefCell, RefMut},
cmp, fmt,
fmt,
rc::Rc,
},
};
@ -32,28 +33,19 @@ pub struct AccountInfo<'a> {
impl<'a> fmt::Debug for AccountInfo<'a> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let data_len = cmp::min(64, self.data_len());
let data_str = if data_len > 0 {
format!(
" data: {} ...",
hex::encode(self.data.borrow()[..data_len].to_vec())
)
} else {
"".to_string()
};
write!(
f,
"AccountInfo {{ key: {} owner: {} is_signer: {} is_writable: {} executable: {} rent_epoch: {} lamports: {} data.len: {} {} }}",
self.key,
self.owner,
self.is_signer,
self.is_writable,
self.executable,
self.rent_epoch,
self.lamports(),
self.data_len(),
data_str,
)
let mut f = f.debug_struct("AccountInfo");
f.field("key", &self.key)
.field("owner", &self.owner)
.field("is_signer", &self.is_signer)
.field("is_writable", &self.is_writable)
.field("executable", &self.executable)
.field("rent_epoch", &self.rent_epoch)
.field("lamports", &self.lamports())
.field("data.len", &self.data_len());
debug_account_data(&self.data.borrow(), &mut f);
f.finish_non_exhaustive()
}
}
@ -415,4 +407,90 @@ mod tests {
let info = AccountInfo::new(&k, false, false, l, d, &k, false, 0);
assert_eq!(info.key, info.as_ref().key);
}
#[test]
fn test_account_info_debug_data() {
let key = Pubkey::new_unique();
let mut lamports = 42;
let mut data = vec![5; 80];
let data_str = format!("{:?}", Hex(&data[..MAX_DEBUG_ACCOUNT_DATA]));
let info = AccountInfo::new(&key, false, false, &mut lamports, &mut data, &key, false, 0);
assert_eq!(
format!("{:?}", info),
format!(
"AccountInfo {{ \
key: {}, \
owner: {}, \
is_signer: {}, \
is_writable: {}, \
executable: {}, \
rent_epoch: {}, \
lamports: {}, \
data.len: {}, \
data: {}, .. }}",
key,
key,
false,
false,
false,
0,
lamports,
data.len(),
data_str,
)
);
let mut data = vec![5; 40];
let data_str = format!("{:?}", Hex(&data));
let info = AccountInfo::new(&key, false, false, &mut lamports, &mut data, &key, false, 0);
assert_eq!(
format!("{:?}", info),
format!(
"AccountInfo {{ \
key: {}, \
owner: {}, \
is_signer: {}, \
is_writable: {}, \
executable: {}, \
rent_epoch: {}, \
lamports: {}, \
data.len: {}, \
data: {}, .. }}",
key,
key,
false,
false,
false,
0,
lamports,
data.len(),
data_str,
)
);
let mut data = vec![];
let info = AccountInfo::new(&key, false, false, &mut lamports, &mut data, &key, false, 0);
assert_eq!(
format!("{:?}", info),
format!(
"AccountInfo {{ \
key: {}, \
owner: {}, \
is_signer: {}, \
is_writable: {}, \
executable: {}, \
rent_epoch: {}, \
lamports: {}, \
data.len: {}, .. }}",
key,
key,
false,
false,
false,
0,
lamports,
data.len(),
)
);
}
}