Skip to content

Commit fcde0ee

Browse files
Frank-AFNFrank-AFN
committed
Fix: test build bug and docker build failed
1 parent 321cf3d commit fcde0ee

File tree

2 files changed

+40
-43
lines changed

2 files changed

+40
-43
lines changed

‎tests/chain_plugin_tests.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
#include <eosio/chain/wast_to_wasm.hpp>
1010
#include <eosio/chain_plugin/chain_plugin.hpp>
1111

12-
#include <asserter/asserter.wast.hpp>
13-
#include <asserter/asserter.abi.hpp>
12+
#include <contracts.hpp>
1413

1514
#include <fc/io/fstream.hpp>
1615

@@ -42,26 +41,26 @@ BOOST_FIXTURE_TEST_CASE( get_block_with_invalid_abi, TESTER ) try {
4241
produce_block();
4342

4443
// setup contract and abi
45-
set_code(N(asserter), asserter_wast);
46-
set_abi(N(asserter), asserter_abi);
44+
set_code( N(asserter), contracts::asserter_wasm() );
45+
set_abi( N(asserter), contracts::asserter_abi().data() );
4746
produce_blocks(1);
4847

49-
auto resolver = [&,this]( const account_name& name ) -> optional<abi_serializer> {
48+
auto resolver = [&,this]( const account_name& name ) -> fc::optional<abi_serializer> {
5049
try {
5150
const auto& accnt = this->control->db().get<account_object,by_name>( name );
5251
abi_def abi;
5352
if (abi_serializer::to_abi(accnt.abi, abi)) {
5453
return abi_serializer(abi, abi_serializer_max_time);
5554
}
56-
return optional<abi_serializer>();
55+
return fc::optional<abi_serializer>();
5756
} FC_RETHROW_EXCEPTIONS(error, "resolver failed at chain_plugin_tests::abi_invalid_type");
5857
};
5958

6059
// abi should be resolved
6160
BOOST_REQUIRE_EQUAL(true, resolver(N(asserter)).valid());
6261

6362
// make an action using the valid contract & abi
64-
variant pretty_trx = mutable_variant_object()
63+
fc::variant pretty_trx = fc::mutable_variant_object()
6564
("actions", variants({
6665
mutable_variant_object()
6766
("account", "asserter")
@@ -100,7 +99,7 @@ BOOST_FIXTURE_TEST_CASE( get_block_with_invalid_abi, TESTER ) try {
10099
BOOST_TEST(block_str.find("011253686f756c64204e6f742041737365727421") != std::string::npos); //action data
101100

102101
// set an invalid abi (int8->xxxx)
103-
std::string abi2 = asserter_abi;
102+
std::string abi2 = contracts::asserter_abi().data();
104103
auto pos = abi2.find("int8");
105104
BOOST_TEST(pos != std::string::npos);
106105
abi2.replace(pos, 4, "xxxx");

‎tests/get_table_tests.cpp

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@
99
#include <eosio/chain/wast_to_wasm.hpp>
1010
#include <eosio/chain_plugin/chain_plugin.hpp>
1111

12-
#include <asserter/asserter.wast.hpp>
13-
#include <asserter/asserter.abi.hpp>
14-
15-
#include <eosio.token/eosio.token.wast.hpp>
16-
#include <eosio.token/eosio.token.abi.hpp>
17-
18-
#include <eosio.system/eosio.system.wast.hpp>
19-
#include <eosio.system/eosio.system.abi.hpp>
12+
#include <contracts.hpp>
2013

2114
#include <fc/io/fstream.hpp>
2215

@@ -51,8 +44,8 @@ BOOST_FIXTURE_TEST_CASE( get_scope_test, TESTER ) try {
5144
create_accounts(accs);
5245
produce_block();
5346

54-
set_code( N(eosio.token), eosio_token_wast );
55-
set_abi( N(eosio.token), eosio_token_abi );
47+
set_code( N(eosio.token), contracts::eosio_token_wasm() );
48+
set_abi( N(eosio.token), contracts::eosio_token_abi().data() );
5649
produce_blocks(1);
5750

5851
// create currency
@@ -76,14 +69,14 @@ BOOST_FIXTURE_TEST_CASE( get_scope_test, TESTER ) try {
7669
eosio::chain_apis::read_only::get_table_by_scope_params param{N(eosio.token), N(accounts), "inita", "", 10};
7770
eosio::chain_apis::read_only::get_table_by_scope_result result = plugin.read_only::get_table_by_scope(param);
7871

79-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
72+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
8073
BOOST_REQUIRE_EQUAL("", result.more);
8174
if (result.rows.size() >= 4) {
8275
BOOST_REQUIRE_EQUAL(name(N(eosio.token)), result.rows[0].code);
8376
BOOST_REQUIRE_EQUAL(name(N(inita)), result.rows[0].scope);
8477
BOOST_REQUIRE_EQUAL(name(N(accounts)), result.rows[0].table);
8578
BOOST_REQUIRE_EQUAL(name(N(eosio)), result.rows[0].payer);
86-
BOOST_REQUIRE_EQUAL(1, result.rows[0].count);
79+
BOOST_REQUIRE_EQUAL(1u, result.rows[0].count);
8780

8881
BOOST_REQUIRE_EQUAL(name(N(initb)), result.rows[1].scope);
8982
BOOST_REQUIRE_EQUAL(name(N(initc)), result.rows[2].scope);
@@ -93,7 +86,7 @@ BOOST_FIXTURE_TEST_CASE( get_scope_test, TESTER ) try {
9386
param.lower_bound = "initb";
9487
param.upper_bound = "initc";
9588
result = plugin.read_only::get_table_by_scope(param);
96-
BOOST_REQUIRE_EQUAL(2, result.rows.size());
89+
BOOST_REQUIRE_EQUAL(2u, result.rows.size());
9790
BOOST_REQUIRE_EQUAL("", result.more);
9891
if (result.rows.size() >= 2) {
9992
BOOST_REQUIRE_EQUAL(name(N(initb)), result.rows[0].scope);
@@ -102,17 +95,17 @@ BOOST_FIXTURE_TEST_CASE( get_scope_test, TESTER ) try {
10295

10396
param.limit = 1;
10497
result = plugin.read_only::get_table_by_scope(param);
105-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
98+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
10699
BOOST_REQUIRE_EQUAL("initc", result.more);
107100

108101
param.table = name(0);
109102
result = plugin.read_only::get_table_by_scope(param);
110-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
103+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
111104
BOOST_REQUIRE_EQUAL("initc", result.more);
112105

113106
param.table = N(invalid);
114107
result = plugin.read_only::get_table_by_scope(param);
115-
BOOST_REQUIRE_EQUAL(0, result.rows.size());
108+
BOOST_REQUIRE_EQUAL(0u, result.rows.size());
116109
BOOST_REQUIRE_EQUAL("", result.more);
117110

118111
} FC_LOG_AND_RETHROW() /// get_scope_test
@@ -127,8 +120,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
127120
create_accounts(accs);
128121
produce_block();
129122

130-
set_code( N(eosio.token), eosio_token_wast );
131-
set_abi( N(eosio.token), eosio_token_abi );
123+
set_code( N(eosio.token), contracts::eosio_token_wasm() );
124+
set_abi( N(eosio.token), contracts::eosio_token_abi().data() );
132125
produce_blocks(1);
133126

134127
// create currency
@@ -201,7 +194,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
201194
p.json = true;
202195
p.index_position = "primary";
203196
eosio::chain_apis::read_only::get_table_rows_result result = plugin.read_only::get_table_rows(p);
204-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
197+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
205198
BOOST_REQUIRE_EQUAL(false, result.more);
206199
if (result.rows.size() >= 4) {
207200
BOOST_REQUIRE_EQUAL("9999.0000 AAA", result.rows[0]["balance"].as_string());
@@ -213,7 +206,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
213206
// get table: reverse ordered
214207
p.reverse = true;
215208
result = plugin.read_only::get_table_rows(p);
216-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
209+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
217210
BOOST_REQUIRE_EQUAL(false, result.more);
218211
if (result.rows.size() >= 4) {
219212
BOOST_REQUIRE_EQUAL("9999.0000 AAA", result.rows[3]["balance"].as_string());
@@ -226,7 +219,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
226219
p.reverse = true;
227220
p.show_payer = true;
228221
result = plugin.read_only::get_table_rows(p);
229-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
222+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
230223
BOOST_REQUIRE_EQUAL(false, result.more);
231224
if (result.rows.size() >= 4) {
232225
BOOST_REQUIRE_EQUAL("9999.0000 AAA", result.rows[3]["data"]["balance"].as_string());
@@ -245,7 +238,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
245238
p.upper_bound = "CCC";
246239
p.reverse = false;
247240
result = plugin.read_only::get_table_rows(p);
248-
BOOST_REQUIRE_EQUAL(2, result.rows.size());
241+
BOOST_REQUIRE_EQUAL(2u, result.rows.size());
249242
BOOST_REQUIRE_EQUAL(false, result.more);
250243
if (result.rows.size() >= 2) {
251244
BOOST_REQUIRE_EQUAL("8888.0000 BBB", result.rows[0]["balance"].as_string());
@@ -257,7 +250,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
257250
p.upper_bound = "CCC";
258251
p.reverse = true;
259252
result = plugin.read_only::get_table_rows(p);
260-
BOOST_REQUIRE_EQUAL(2, result.rows.size());
253+
BOOST_REQUIRE_EQUAL(2u, result.rows.size());
261254
BOOST_REQUIRE_EQUAL(false, result.more);
262255
if (result.rows.size() >= 2) {
263256
BOOST_REQUIRE_EQUAL("8888.0000 BBB", result.rows[1]["balance"].as_string());
@@ -269,7 +262,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
269262
p.limit = 1;
270263
p.reverse = false;
271264
result = plugin.read_only::get_table_rows(p);
272-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
265+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
273266
BOOST_REQUIRE_EQUAL(true, result.more);
274267
if (result.rows.size() >= 1) {
275268
BOOST_REQUIRE_EQUAL("9999.0000 AAA", result.rows[0]["balance"].as_string());
@@ -280,7 +273,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
280273
p.limit = 1;
281274
p.reverse = true;
282275
result = plugin.read_only::get_table_rows(p);
283-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
276+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
284277
BOOST_REQUIRE_EQUAL(true, result.more);
285278
if (result.rows.size() >= 1) {
286279
BOOST_REQUIRE_EQUAL("10000.0000 SYS", result.rows[0]["balance"].as_string());
@@ -292,7 +285,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
292285
p.limit = 1;
293286
p.reverse = false;
294287
result = plugin.read_only::get_table_rows(p);
295-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
288+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
296289
BOOST_REQUIRE_EQUAL(true, result.more);
297290
if (result.rows.size() >= 1) {
298291
BOOST_REQUIRE_EQUAL("8888.0000 BBB", result.rows[0]["balance"].as_string());
@@ -304,7 +297,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_test, TESTER ) try {
304297
p.limit = 1;
305298
p.reverse = true;
306299
result = plugin.read_only::get_table_rows(p);
307-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
300+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
308301
BOOST_REQUIRE_EQUAL(true, result.more);
309302
if (result.rows.size() >= 1) {
310303
BOOST_REQUIRE_EQUAL("7777.0000 CCC", result.rows[0]["balance"].as_string());
@@ -322,8 +315,8 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
322315
create_accounts(accs);
323316
produce_block();
324317

325-
set_code( N(eosio.token), eosio_token_wast );
326-
set_abi( N(eosio.token), eosio_token_abi );
318+
set_code( N(eosio.token), contracts::eosio_token_wasm() );
319+
set_abi( N(eosio.token), contracts::eosio_token_abi().data() );
327320
produce_blocks(1);
328321

329322
// create currency
@@ -342,8 +335,13 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
342335
}
343336
produce_blocks(1);
344337

345-
set_code( config::system_account_name, eosio_system_wast );
346-
set_abi( config::system_account_name, eosio_system_abi );
338+
set_code( config::system_account_name, contracts::eosio_system_wasm() );
339+
set_abi( config::system_account_name, contracts::eosio_system_abi().data() );
340+
341+
base_tester::push_action(config::system_account_name, N(init),
342+
config::system_account_name, mutable_variant_object()
343+
("version", 0)
344+
("core", CORE_SYM_STR));
347345

348346
// bidname
349347
auto bidname = [this]( const account_name& bidder, const account_name& newname, const asset& bid ) {
@@ -370,7 +368,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
370368
p.index_position = "secondary"; // ordered by high_bid
371369
p.key_type = "i64";
372370
eosio::chain_apis::read_only::get_table_rows_result result = plugin.read_only::get_table_rows(p);
373-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
371+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
374372
BOOST_REQUIRE_EQUAL(false, result.more);
375373
if (result.rows.size() >= 4) {
376374
BOOST_REQUIRE_EQUAL("html", result.rows[0]["newname"].as_string());
@@ -394,7 +392,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
394392
p.reverse = true;
395393
p.show_payer = true;
396394
result = plugin.read_only::get_table_rows(p);
397-
BOOST_REQUIRE_EQUAL(4, result.rows.size());
395+
BOOST_REQUIRE_EQUAL(4u, result.rows.size());
398396
BOOST_REQUIRE_EQUAL(false, result.more);
399397
if (result.rows.size() >= 4) {
400398
BOOST_REQUIRE_EQUAL("html", result.rows[3]["data"]["newname"].as_string());
@@ -423,7 +421,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
423421
p.show_payer = false;
424422
p.limit = 1;
425423
result = plugin.read_only::get_table_rows(p);
426-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
424+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
427425
BOOST_REQUIRE_EQUAL(true, result.more);
428426
if (result.rows.size() >= 1) {
429427
BOOST_REQUIRE_EQUAL("html", result.rows[0]["newname"].as_string());
@@ -436,7 +434,7 @@ BOOST_FIXTURE_TEST_CASE( get_table_by_seckey_test, TESTER ) try {
436434
p.show_payer = false;
437435
p.limit = 1;
438436
result = plugin.read_only::get_table_rows(p);
439-
BOOST_REQUIRE_EQUAL(1, result.rows.size());
437+
BOOST_REQUIRE_EQUAL(1u, result.rows.size());
440438
BOOST_REQUIRE_EQUAL(true, result.more);
441439
if (result.rows.size() >= 1) {
442440
BOOST_REQUIRE_EQUAL("com", result.rows[0]["newname"].as_string());

0 commit comments

Comments
 (0)