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

Fix runtime api #1464

Merged
merged 5 commits into from
Jan 11, 2023
+119 −268
Merged

Fix runtime api #1464

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6a7408
don't commit intermediate state trie
turuslan Jan 9, 2023
03cae6f
fix unused test
turuslan Jan 9, 2023
249c4e7
Merge branch 'k1' into fix/runtime-api
turuslan Jan 11, 2023
5145e08
Merge remote-tracking branch 'origin/master' into fix/runtime-api
turuslan Jan 11, 2023
bccc652
fix unused error
turuslan Jan 11, 2023
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
Prev Previous commit
fix unused error 
Signed-off-by: turuslan <[email protected]>
  • Loading branch information
@turuslan
turuslan committed Jan 11, 2023
commit bccc6525ec6ade4b1965c7e284923ca92c4cc306
19 changes: 5 additions & 14 deletions test/core/runtime/executor_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -83,8 +83,7 @@ class ExecutorTest : public testing::Test {
kagome::storage::trie::RootHash const &storage_state,
int arg1,
int arg2,
int res,
kagome::storage::trie::RootHash const &next_storage_state) {
int res) {
static Buffer enc_args;
enc_args = Buffer{scale::encode(arg1, arg2).value()};
const PtrSize RESULT_LOCATION{3, 4};
@@ -99,7 +98,6 @@ class ExecutorTest : public testing::Test {
env_factory_},
blockchain_state,
storage_state,
next_storage_state = std::move(next_storage_state),
this,
RESULT_LOCATION](auto &) {
auto env_template =
@@ -108,11 +106,7 @@ class ExecutorTest : public testing::Test {
EXPECT_CALL(*env_template, persistent())
.WillOnce(ReturnRef(*env_template));
EXPECT_CALL(*env_template, make())
.WillOnce(Invoke([this,
RESULT_LOCATION,
blockchain_state,
next_storage_state =
std::move(next_storage_state)] {
.WillOnce(Invoke([this, RESULT_LOCATION, blockchain_state] {
auto module_instance =
std::make_shared<ModuleInstanceMock>();
EXPECT_CALL(*module_instance, resetEnvironment())
@@ -214,8 +208,7 @@ TEST_F(ExecutorTest, LatestStateSwitchesCorrectly) {
kagome::primitives::BlockInfo block_info2{43, "block_hash2"_hash256};
kagome::primitives::BlockInfo block_info3{44, "block_hash3"_hash256};

preparePersistentCall(
block_info1, "state_hash1"_hash256, 2, 3, 5, "state_hash2"_hash256);
preparePersistentCall(block_info1, "state_hash1"_hash256, 2, 3, 5);
auto env = executor.persistentAt(block_info1.hash).value();
EXPECT_EQ(executor.call<int>(*env, "addTwo", 2, 3).value(), 5);

@@ -225,8 +218,7 @@ TEST_F(ExecutorTest, LatestStateSwitchesCorrectly) {
block_info1, "state_hash2"_hash256, "addTwo", 7, 10));
ASSERT_EQ(res2, 17);

preparePersistentCall(
block_info1, "state_hash2"_hash256, 0, 0, 0, "state_hash3"_hash256);
preparePersistentCall(block_info1, "state_hash2"_hash256, 0, 0, 0);
auto env3 = executor.persistentAt(block_info1.hash).value();
EXPECT_EQ(executor.call<int>(*env3, "addTwo", 0, 0).value(), 0);

@@ -236,8 +228,7 @@ TEST_F(ExecutorTest, LatestStateSwitchesCorrectly) {
block_info1, "state_hash3"_hash256, "addTwo", 7, 10));
ASSERT_EQ(res4, 17);

preparePersistentCall(
block_info2, "state_hash4"_hash256, -5, 5, 0, "state_hash5"_hash256);
preparePersistentCall(block_info2, "state_hash4"_hash256, -5, 5, 0);
auto env5 = executor.persistentAt(block_info2.hash).value();
EXPECT_EQ(executor.call<int>(*env5, "addTwo", -5, 5).value(), 0);