pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 04:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle local storage race conditions better (#3177)

Browse Source 
* Make local_storage_compare_and_set take Option for old_value

* Adapt srml/im-online to API changes

* Bump version

* Bump version again

* Replace match
This commit is contained in:
Michael Müller
2019-07-26 01:42:40 +02:00
committed by Gavin Wood
parent af914e9f40
commit 23fba990ba
11 changed files with 118 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/executor/runtime-test/src/lib.rs
+11 -1
View File
@@ -143,12 +143,22 @@ impl_stubs!(
runtime_io::local_storage_set(kind, b"test", b"asd");
assert_eq!(runtime_io::local_storage_get(kind, b"test"), Some(b"asd".to_vec()));
let res = runtime_io::local_storage_compare_and_set(kind, b"test", b"asd", b"");
let res = runtime_io::local_storage_compare_and_set(kind, b"test", Some(b"asd"), b"");
assert_eq!(res, true);
assert_eq!(runtime_io::local_storage_get(kind, b"test"), Some(b"".to_vec()));
[0].to_vec()
},
test_offchain_local_storage_with_none => |_| {
let kind = substrate_primitives::offchain::StorageKind::PERSISTENT;
assert_eq!(runtime_io::local_storage_get(kind, b"test"), None);
let res = runtime_io::local_storage_compare_and_set(kind, b"test", None, b"value");
assert_eq!(res, true);
assert_eq!(runtime_io::local_storage_get(kind, b"test"), Some(b"value".to_vec()));
[0].to_vec()
},
test_offchain_http => |_| {
use substrate_primitives::offchain::HttpRequestStatus;
let run = || -> Option<()> {
substrate/core/executor/src/wasm_executor.rs
+13 -6
View File
@@ -949,17 +949,24 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
.map_err(|_| "storage kind OOB while ext_local_storage_compare_and_set: wasm")?;
let key = this.memory.get(key, key_len as usize)
.map_err(|_| "OOB while ext_local_storage_compare_and_set: wasm")?;
let old_value = this.memory.get(old_value, old_value_len as usize)
.map_err(|_| "OOB while ext_local_storage_compare_and_set: wasm")?;
let new_value = this.memory.get(new_value, new_value_len as usize)
.map_err(|_| "OOB while ext_local_storage_compare_and_set: wasm")?;
let res = this.ext.offchain()
.map(|api| api.local_storage_compare_and_set(kind, &key, &old_value, &new_value))
.ok_or_else(|| "Calling unavailable API ext_local_storage_compare_andset: wasm")?;
let res = {
if old_value == u32::max_value() {
this.ext.offchain()
.map(|api| api.local_storage_compare_and_set(kind, &key, None, &new_value))
.ok_or_else(|| "Calling unavailable API ext_local_storage_compare_and_set: wasm")?
} else {
let v = this.memory.get(old_value, old_value_len as usize)
.map_err(|_| "OOB while ext_local_storage_compare_and_set: wasm")?;
this.ext.offchain()
.map(|api| api.local_storage_compare_and_set(kind, &key, Some(v.as_slice()), &new_value))
.ok_or_else(|| "Calling unavailable API ext_local_storage_compare_and_set: wasm")?
}
};
Ok(if res { 0 } else { 1 })
},
ext_http_request_start(
method: *const u8,