未验证 提交 da369b9d 编写于 作者: W wanderingbort 提交者: GitHub

Merge pull request #3677 from EOSIO/bump-up-leeway

increase default leeway to 3 ms
......@@ -77,7 +77,7 @@ namespace eosio { namespace chain {
bool apply_context_free = true;
fc::time_point deadline = fc::time_point::maximum();
fc::microseconds leeway = fc::microseconds(1000);
fc::microseconds leeway = fc::microseconds(3000);
int64_t billed_cpu_time_us = 0;
private:
......
......@@ -289,16 +289,16 @@ namespace eosio { namespace chain {
} else if( deadline_exception_code == block_cpu_usage_exceeded::code_value ) {
EOS_THROW( block_cpu_usage_exceeded,
"not enough time left in block to complete executing transaction",
("now", now)("deadline", _deadline)("start", start) );
("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
} else if( deadline_exception_code == tx_cpu_usage_exceeded::code_value ) {
EOS_THROW( tx_cpu_usage_exceeded,
"transaction was executing for too long",
("now", now)("deadline", _deadline)("start", start) );
("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
} else if( deadline_exception_code == leeway_deadline_exception::code_value ) {
EOS_THROW( leeway_deadline_exception,
"the transaction was unable to complete by deadline, "
"but it is possible it could have succeeded if it were allow to run to completion",
("now", now)("deadline", _deadline)("start", start) );
"but it is possible it could have succeeded if it were allowed to run to completion",
("now", now)("deadline", _deadline)("start", start)("billing_timer", now - pseudo_start) );
}
FC_ASSERT( false, "unexpected deadline exception code" );
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册