提交 caca0aac 编写于 作者: B Bucky Kittinger

Finally fixed the eosiod_tests issue

上级 023846f2
......@@ -753,11 +753,11 @@ using apply_handler = std::function<void(apply_context&)>;
auto tuple = boost::make_tuple( next_tid );
auto itr = idx.lower_bound(tuple);
if( std::distance(idx.begin(), itr) == 0 ) return 0;
if( std::distance(idx.begin(), itr) == 0 ) return -1;
--itr;
if( itr->t_id != t_id.id ) return 0;
if( itr->t_id != t_id.id ) return -1;
impl::key_helper<typename IndexType::value_type>::get(keys, *itr);
......
......@@ -153,11 +153,12 @@ namespace eosio { namespace chain {
class producer_object;
using block_id_type = fc::sha256;
using checksum_type = fc::sha256;
using checksum256_type = fc::sha256;
using checksum512_type = fc::sha512;
using checksum160_type = fc::ripemd160;
using transaction_id_type = checksum256_type;
using digest_type = checksum256_type;
using transaction_id_type = checksum_type;
using digest_type = checksum_type;
using weight_type = uint16_t;
using block_num_type = uint32_t;
using share_type = int64_t;
......
......@@ -36,39 +36,6 @@ using namespace IR;
using namespace Runtime;
using boost::asio::io_service;
#if 0
// account.h/hpp expected account API balance interchange format
// must match account.hpp account_balance definition
PACKED_STRUCT(
struct account_balance
{
/**
* Name of the account who's balance this is
*/
eosio::chain::account_name account;
/**
* Balance for this account
*/
eosio::chain::asset eos_balance;
/**
* Staked balance for this account
*/
eosio::chain::asset staked_balance;
/**
* Unstaking balance for this account
*/
eosio::chain::asset unstaking_balance;
/**
* Time at which last unstaking occurred for this account
*/
eosio::chain::time last_unstaking_time;
})
#endif
namespace eosio { namespace chain {
using namespace contracts;
......@@ -927,7 +894,7 @@ class db_index_api : public context_aware_api {
int call(ContextMethodType method, const account_name& code, const scope_name& scope, const name& table, array_ptr<char> data, size_t data_len) {
auto maybe_t_id = context.find_table(code, scope, table);
if (maybe_t_id == nullptr) {
return 0;
return -1;
}
const auto& t_id = *maybe_t_id;
......@@ -938,7 +905,7 @@ class db_index_api : public context_aware_api {
size_t record_len = data_len - sizeof(KeyArrayType);
auto res = (context.*(method))(t_id, keys, record_data, record_len);
if (res != 0) {
if (res != -1) {
res += sizeof(KeyArrayType);
}
return res;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册