Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
1987a7da
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1987a7da
编写于
11月 11, 2017
作者:
K
Kevin Heifner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Renamed addition attributes gcc doesn't like. #665
上级
d2574cfa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
libraries/chain/chain_controller.cpp
libraries/chain/chain_controller.cpp
+8
-8
libraries/chain/include/eos/chain/transaction.hpp
libraries/chain/include/eos/chain/transaction.hpp
+3
-3
未找到文件。
libraries/chain/chain_controller.cpp
浏览文件 @
1987a7da
...
@@ -629,8 +629,8 @@ void check_output(const generated_transaction& expected, const generated_transac
...
@@ -629,8 +629,8 @@ void check_output(const generated_transaction& expected, const generated_transac
template
<
>
template
<
>
void
check_output
(
const
message_output
&
expected
,
const
message_output
&
actual
,
const
path_cons_list
&
path
)
{
void
check_output
(
const
message_output
&
expected
,
const
message_output
&
actual
,
const
path_cons_list
&
path
)
{
check_output
(
expected
.
notify
,
actual
.
notify
,
path
(
".notify"
));
check_output
(
expected
.
notify
,
actual
.
notify
,
path
(
".notify"
));
check_output
(
expected
.
inline_tr
ansaction
,
actual
.
inline_transaction
,
path
(
".inline_transaction
"
));
check_output
(
expected
.
inline_tr
x
,
actual
.
inline_trx
,
path
(
".inline_trx
"
));
check_output
(
expected
.
deferred_tr
ansactions
,
actual
.
deferred_transactions
,
path
(
".deferred_transaction
s"
));
check_output
(
expected
.
deferred_tr
xs
,
actual
.
deferred_trxs
,
path
(
".deferred_trx
s"
));
}
}
template
<
typename
T
>
template
<
typename
T
>
...
@@ -973,8 +973,8 @@ void chain_controller::process_message(const transaction& trx, account_name code
...
@@ -973,8 +973,8 @@ void chain_controller::process_message(const transaction& trx, account_name code
// combine inline messages and process
// combine inline messages and process
if
(
apply_ctx
.
inline_messages
.
size
()
>
0
)
{
if
(
apply_ctx
.
inline_messages
.
size
()
>
0
)
{
output
.
inline_tr
ansaction
=
inline_transaction
(
trx
);
output
.
inline_tr
x
=
inline_transaction
(
trx
);
(
*
output
.
inline_tr
ansaction
).
messages
=
std
::
move
(
apply_ctx
.
inline_messages
);
(
*
output
.
inline_tr
x
).
messages
=
std
::
move
(
apply_ctx
.
inline_messages
);
}
}
for
(
auto
&
asynctrx
:
apply_ctx
.
deferred_transactions
)
{
for
(
auto
&
asynctrx
:
apply_ctx
.
deferred_transactions
)
{
...
@@ -989,7 +989,7 @@ void chain_controller::process_message(const transaction& trx, account_name code
...
@@ -989,7 +989,7 @@ void chain_controller::process_message(const transaction& trx, account_name code
transaction
.
status
=
generated_transaction_object
::
PENDING
;
transaction
.
status
=
generated_transaction_object
::
PENDING
;
});
});
output
.
deferred_tr
ansaction
s
.
emplace_back
(
gtrx
);
output
.
deferred_tr
x
s
.
emplace_back
(
gtrx
);
}
}
// propagate used_authorizations up the context chain
// propagate used_authorizations up the context chain
...
@@ -1062,9 +1062,9 @@ typename T::processed chain_controller::process_transaction( const T& trx, int d
...
@@ -1062,9 +1062,9 @@ typename T::processed chain_controller::process_transaction( const T& trx, int d
auto
&
output
=
ptrx
.
output
[
i
];
auto
&
output
=
ptrx
.
output
[
i
];
rate_limit_message
(
trx
.
messages
[
i
]);
rate_limit_message
(
trx
.
messages
[
i
]);
process_message
(
trx
,
trx
.
messages
[
i
].
code
,
trx
.
messages
[
i
],
output
);
process_message
(
trx
,
trx
.
messages
[
i
].
code
,
trx
.
messages
[
i
],
output
);
if
(
output
.
inline_tr
ansaction
.
valid
()
)
{
if
(
output
.
inline_tr
x
.
valid
()
)
{
const
transaction
&
trx
=
*
output
.
inline_tr
ansaction
;
const
transaction
&
trx
=
*
output
.
inline_tr
x
;
output
.
inline_tr
ansaction
=
process_transaction
(
pending_inline_transaction
(
trx
),
depth
+
1
,
start_time
);
output
.
inline_tr
x
=
process_transaction
(
pending_inline_transaction
(
trx
),
depth
+
1
,
start_time
);
}
}
}
}
...
...
libraries/chain/include/eos/chain/transaction.hpp
浏览文件 @
1987a7da
...
@@ -170,8 +170,8 @@ namespace eosio { namespace chain {
...
@@ -170,8 +170,8 @@ namespace eosio { namespace chain {
*/
*/
struct
message_output
{
struct
message_output
{
vector
<
notify_output
>
notify
;
///< accounts to notify, may only be notified once
vector
<
notify_output
>
notify
;
///< accounts to notify, may only be notified once
fc
::
optional
<
inline_transaction
>
inline_tr
ansaction
;
///< transactions generated and applied after notify
fc
::
optional
<
inline_transaction
>
inline_tr
x
;
///< transactions generated and applied after notify
vector
<
generated_transaction
>
deferred_tr
ansaction
s
;
///< transactions generated but not applied
vector
<
generated_transaction
>
deferred_tr
x
s
;
///< transactions generated but not applied
};
};
struct
notify_output
{
struct
notify_output
{
...
@@ -200,7 +200,7 @@ namespace eosio { namespace chain {
...
@@ -200,7 +200,7 @@ namespace eosio { namespace chain {
FC_REFLECT
(
eosio
::
chain
::
generated_transaction
,
(
id
))
FC_REFLECT
(
eosio
::
chain
::
generated_transaction
,
(
id
))
FC_REFLECT_DERIVED
(
eosio
::
chain
::
signed_transaction
,
(
eosio
::
types
::
signed_transaction
),
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
signed_transaction
,
(
eosio
::
types
::
signed_transaction
),
)
FC_REFLECT
(
eosio
::
chain
::
message_output
,
(
notify
)(
inline_tr
ansaction
)(
deferred_transaction
s
)
)
FC_REFLECT
(
eosio
::
chain
::
message_output
,
(
notify
)(
inline_tr
x
)(
deferred_trx
s
)
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
processed_transaction
,
(
eosio
::
types
::
signed_transaction
),
(
output
)
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
processed_transaction
,
(
eosio
::
types
::
signed_transaction
),
(
output
)
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
pending_inline_transaction
,
(
eosio
::
types
::
transaction
),
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
pending_inline_transaction
,
(
eosio
::
types
::
transaction
),
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
inline_transaction
,
(
eosio
::
types
::
transaction
),
(
output
)
)
FC_REFLECT_DERIVED
(
eosio
::
chain
::
inline_transaction
,
(
eosio
::
types
::
transaction
),
(
output
)
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录