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

Remove more unwraps (#5267)

Browse Source 
automerge
This commit is contained in:
Jack May
2019-07-24 12:30:43 -07:00
committed by Grimes
parent 1046c5e32c
commit c3a941086d
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
programs/move_loader_api/src/data_store.rs
View File

@@ -44,7 +44,7 @@ impl DataStore {
}
/// Returns a `WriteSet` for each account in the `DataStore`
pub fn into_write_sets(mut self) -> HashMap<AccountAddress, WriteSet> {
pub fn into_write_sets(mut self) -> Result<HashMap<AccountAddress, WriteSet>> {
let mut write_set_muts: HashMap<AccountAddress, WriteSetMut> = HashMap::new();
for (access_path, value) in self.data.drain() {
match write_set_muts.get_mut(&access_path.address) {
@@ -60,9 +60,9 @@ impl DataStore {
// Freeze each WriteSet
let mut write_sets: HashMap<AccountAddress, WriteSet> = HashMap::new();
for (address, write_set_mut) in write_set_muts.drain() {
write_sets.insert(address, write_set_mut.freeze().unwrap());
write_sets.insert(address, write_set_mut.freeze()?);
}
write_sets
Ok(write_sets)
}
/// Read an account's resource