kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move transaction validity check to Format

Browse Source
This commit is contained in:
Julien Cretin
2020-11-03 12:54:30 +01:00
parent d734da3a0e
commit 410314b780
3 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/persistent_store/src/store.rs
View File

@@ -259,26 +259,11 @@ impl<S: Storage> Store<S> {
StoreUpdate::Remove { key } => return self.remove(key),
}
}
if count > self.format.max_updates() {
return Err(StoreError::InvalidArgument);
}
// Check that the updates are valid.
let mut sorted_keys = Vec::with_capacity(count as usize);
for update in updates {
let key = usize_to_nat(update.key());
if key > self.format.max_key() {
return Err(StoreError::InvalidArgument);
}
if let Some(value) = update.value() {
if usize_to_nat(value.len()) > self.format.max_value_len() {
return Err(StoreError::InvalidArgument);
}
}
match sorted_keys.binary_search(&key) {
Ok(_) => return Err(StoreError::InvalidArgument),
Err(pos) => sorted_keys.insert(pos, key),
}
}
// Get the sorted keys. Fail if the transaction is invalid.
let sorted_keys = match self.format.transaction_valid(updates) {
None => return Err(StoreError::InvalidArgument),
Some(x) => x,
};
// Reserve the capacity.
self.reserve(self.format.transaction_capacity(updates))?;
// Write the marker entry.