Skip to content
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

Add a method to fetch an unhashed key, close #100 #152

Merged
merged 3 commits into from
Aug 13, 2020
Merged

Add a method to fetch an unhashed key, close #100 #152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf3d5d3
Add a method to fetch an unhashed key, close #100
en Aug 13, 2020
cc3e5d1
Return decoded value
en Aug 13, 2020
5d5b28b
Refactoring
en Aug 13, 2020
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
19 changes: 14 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,20 +258,29 @@ impl<T: Runtime> Client<T> {
&self.metadata
}

/// Fetch a StorageKey with an optional block hash.
pub async fn fetch<F: Store<T>>(
/// Fetch the value under an unhashed storage key
pub async fn fetch_unhashed<V: Decode>(
&self,
store: &F,
key: StorageKey,
hash: Option<T::Hash>,
) -> Result<Option<F::Returns>, Error> {
let key = store.key(&self.metadata)?;
) -> Result<Option<V>, Error> {
if let Some(data) = self.rpc.storage(&key, hash).await? {
Ok(Some(Decode::decode(&mut &data.0[..])?))
} else {
Ok(None)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more thing: could you modify fetch below 👇 to call this method just to reduce the duplication.


/// Fetch a StorageKey with an optional block hash.
pub async fn fetch<F: Store<T>>(
&self,
store: &F,
hash: Option<T::Hash>,
) -> Result<Option<F::Returns>, Error> {
let key = store.key(&self.metadata)?;
self.fetch_unhashed::<F::Returns>(key, hash).await
}

/// Fetch a StorageKey that has a default value with an optional block hash.
pub async fn fetch_or_default<F: Store<T>>(
&self,
Expand Down