Skip to content

Fix storage read #522

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
kamilsa merged 3 commits into from
Sep 11, 2020
Merged

Fix storage read #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c29ed7
Fix storage read
kamilsa Sep 10, 2020
d159e07
Update test
kamilsa Sep 10, 2020
718afaf
Review issues
kamilsa Sep 11, 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
7 changes: 3 additions & 4 deletions core/extensions/impl/storage_extension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,16 @@ namespace kagome::extensions {
runtime::WasmSpan key_pos,
runtime::WasmSpan value_out,
runtime::WasmOffset offset) {
static constexpr runtime::WasmSpan kErrorSpan = -1;

auto [key_ptr, key_size] = runtime::WasmResult(key_pos);
auto [value_ptr, value_size] = runtime::WasmResult(value_out);

auto key = memory_->loadN(key_ptr, key_size);
boost::optional<uint32_t> res{boost::none};
Copy link
Contributor

@iceseer iceseer Sep 10, 2020

Choose a reason for hiding this comment

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

It initializes with none in ctor by def, i suppose.

Copy link
Contributor Author

@kamilsa kamilsa Sep 11, 2020

Choose a reason for hiding this comment

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

yes, but making it explicit improves readability I suppose

if (auto data = get(key, offset, value_size)) {
memory_->storeBuffer(value_ptr, data.value());
return runtime::WasmResult(0, data.value().size()).combine();
res = value_size;
}
return kErrorSpan;
return memory_->storeBuffer(scale::encode(res).value());
}

void StorageExtension::ext_set_storage(const runtime::WasmPointer key_data,
Expand Down
10 changes: 8 additions & 2 deletions test/core/extensions/storage_extension_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,8 @@ TEST_P(OutcomeParameterizedTest, StorageReadTest) {
WasmResult value(42, 41);
Buffer value_data(8, 'v');
WasmOffset offset = 0;
EXPECT_OUTCOME_TRUE(encoded_opt_val_size, kagome::scale::encode(boost::make_optional(value.length)));
WasmSpan res_wasm_span = 1337;

// expect key loaded, than data stored
EXPECT_CALL(*memory_, loadN(key.address, key.length))
Expand All @@ -446,9 +448,13 @@ TEST_P(OutcomeParameterizedTest, StorageReadTest) {
EXPECT_CALL(*trie_batch_, get(key_data)).WillOnce(Return(value_data));
EXPECT_CALL(*memory_,
storeBuffer(value.address, gsl::span<const uint8_t>(value_data)));
EXPECT_CALL(*memory_,
storeBuffer(gsl::span<const uint8_t>(encoded_opt_val_size)))
.WillOnce(Return(res_wasm_span));

storage_extension_->ext_storage_read_version_1(
key.combine(), value.combine(), offset);
ASSERT_EQ(res_wasm_span,
storage_extension_->ext_storage_read_version_1(
key.combine(), value.combine(), offset));
}

INSTANTIATE_TEST_CASE_P(Instance,
Expand Down