Skip to content

Improve TryDecodeEntireState output #2724

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
merged 10 commits into from
Dec 23, 2023
Merged

Improve TryDecodeEntireState output #2724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c57775d
improve decode err output
liamaharon Dec 15, 2023
d1de7ac
? syntax
liamaharon Dec 15, 2023
587c57b
clean up
liamaharon Dec 15, 2023
06df60d
Merge branch 'master' into liam-improve-decode-err-output
liamaharon Dec 18, 2023
2840411
fix missing first key
liamaharon Dec 18, 2023
01dc683
Merge branch 'liam-improve-decode-err-output' of github.com:paritytec…
liamaharon Dec 18, 2023
cd673c5
remove hex and add test
liamaharon Dec 18, 2023
048fe64
improve log
liamaharon Dec 20, 2023
7dae7a0
fix
liamaharon Dec 20, 2023
8d3ceba
Merge branch 'master' into liam-improve-decode-err-output
liamaharon Dec 20, 2023
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
Prev Previous commit
Next Next commit
remove hex and add test
  • Loading branch information
@liamaharon
liamaharon committed Dec 18, 2023
commit cd673c5281b3b9b6ba2ea71d606118d6ff496f11
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion substrate/frame/support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ sp-weights = { path = "../../primitives/weights", default-features = false }
sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false }
sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false }
tt-call = "1.0.8"
hex = { default-features = false, version = "0.4.3", features = ["alloc"] }
macro_magic = "0.5.0"
frame-support-procedural = { path = "procedural", default-features = false }
paste = "1.0"
Expand Down
12 changes: 9 additions & 3 deletions substrate/frame/support/src/traits/try_runtime/decode_entire_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl core::fmt::Display for TryDecodeEntireStorageError {
"`{}::{}` key `{}` is undecodable",
&sp_std::str::from_utf8(&self.info.pallet_name).unwrap_or("<invalid>"),
&sp_std::str::from_utf8(&self.info.storage_name).unwrap_or("<invalid>"),
hex::encode(&self.key)
array_bytes::bytes2hex("0x", &self.key)
)
}
}
Expand All @@ -94,8 +94,8 @@ impl core::fmt::Debug for TryDecodeEntireStorageError {
write!(
f,
"key: {} value: {} info: {:?}",
hex::encode(&self.key),
hex::encode(self.raw.clone().unwrap_or_default()),
array_bytes::bytes2hex("0x", &self.key),
array_bytes::bytes2hex("0x", self.raw.clone().unwrap_or_default()),
self.info
)
}
Expand Down Expand Up @@ -375,6 +375,12 @@ mod tests {
// two bytes, cannot be decoded into u32.
sp_io::storage::set(&Map::hashed_key_for(2), &[0u8, 1]);
assert!(Map::try_decode_entire_state().is_err());
assert_eq!(Map::try_decode_entire_state().unwrap_err().len(), 1);

// multiple errs in the same map are be detected
sp_io::storage::set(&Map::hashed_key_for(3), &[0u8, 1]);
assert!(Map::try_decode_entire_state().is_err());
assert_eq!(Map::try_decode_entire_state().unwrap_err().len(), 2);
})
}

Expand Down