提交 7355fa03 编写于 作者: K Kevin Heifner

Change push_nonce, now called push_dummy, test code to use a require auth...

Change push_nonce, now called push_dummy, test code to use a require auth action since nonce is context free.
上级 8c2e9e1d
...@@ -46,7 +46,8 @@ namespace eosio { namespace testing { ...@@ -46,7 +46,8 @@ namespace eosio { namespace testing {
transaction_trace push_reqauth( account_name from, const vector<permission_level>& auths, const vector<private_key_type>& keys ); transaction_trace push_reqauth( account_name from, const vector<permission_level>& auths, const vector<private_key_type>& keys );
transaction_trace push_reqauth(account_name from, string role, bool multi_sig = false); transaction_trace push_reqauth(account_name from, string role, bool multi_sig = false);
transaction_trace push_nonce( account_name from, const string& v = "blah" ); // use when just want any old non-context free action
transaction_trace push_dummy(account_name from, const string& v = "blah");
transaction_trace transfer( account_name from, account_name to, asset amount, string memo, account_name currency ); transaction_trace transfer( account_name from, account_name to, asset amount, string memo, account_name currency );
transaction_trace transfer( account_name from, account_name to, string amount, string memo, account_name currency ); transaction_trace transfer( account_name from, account_name to, string amount, string memo, account_name currency );
......
...@@ -190,17 +190,28 @@ namespace eosio { namespace testing { ...@@ -190,17 +190,28 @@ namespace eosio { namespace testing {
} }
} }
transaction_trace base_tester::push_nonce(account_name from, const string& v) { transaction_trace base_tester::push_dummy(account_name from, const string& v) {
// use reqauth for a normal action, this could be anything
variant pretty_trx = fc::mutable_variant_object() variant pretty_trx = fc::mutable_variant_object()
("actions", fc::variants({ ("actions", fc::variants({
fc::mutable_variant_object() fc::mutable_variant_object()
("account", name(config::system_account_name)) ("account", name(config::system_account_name))
("name", "nonce") ("name", "reqauth")
("authorization", fc::variants({ ("authorization", fc::variants({
fc::mutable_variant_object() fc::mutable_variant_object()
("actor", from) ("actor", from)
("permission", name(config::active_name)) ("permission", name(config::active_name))
})) }))
("data", fc::mutable_variant_object()
("from", from)
)
})
)
// lets also push a context free action just because we used to use nonce for this
("context_free_actions", fc::variants({
fc::mutable_variant_object()
("account", name(config::system_account_name))
("name", "nonce")
("data", fc::mutable_variant_object() ("data", fc::mutable_variant_object()
("value", v) ("value", v)
) )
......
...@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE( push_block ) { try { ...@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE( push_block ) { try {
test1.create_account(N(alice)); test1.create_account(N(alice));
test2.control->push_block(test1.produce_block()); test2.control->push_block(test1.produce_block());
test1.push_nonce(N(alice), "Foo!"); test1.push_dummy(N(alice), "Foo!");
test2.control->push_block(test1.produce_block()); test2.control->push_block(test1.produce_block());
} FC_LOG_AND_RETHROW() }/// schedule_test } FC_LOG_AND_RETHROW() }/// schedule_test
......
...@@ -246,11 +246,11 @@ BOOST_FIXTURE_TEST_CASE( prove_action_in_block, tester ) { try { ...@@ -246,11 +246,11 @@ BOOST_FIXTURE_TEST_CASE( prove_action_in_block, tester ) { try {
produce_blocks(50); produce_blocks(50);
push_nonce( N(alice), "AB" ); push_dummy(N(alice), "AB");
push_nonce( N(bob), "BC" ); push_dummy(N(bob), "BC");
push_nonce( N(carol), "CD" ); push_dummy(N(carol), "CD");
push_nonce( N(david), "DE" ); push_dummy(N(david), "DE");
push_nonce( N(elvis), "EF" ); push_dummy(N(elvis), "EF");
produce_blocks(50); produce_blocks(50);
digest_type block_mroot = process_merkle(nodes, move(block_leaves)); digest_type block_mroot = process_merkle(nodes, move(block_leaves));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册