Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
77110fa4
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,发现更多精彩内容 >>
提交
77110fa4
编写于
4月 12, 2018
作者:
B
Bucky Kittinger
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Renamed clauses to ricardian_clauses
上级
576aef8d
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
45 addition
and
45 deletion
+45
-45
contracts/asserter/asserter.abi
contracts/asserter/asserter.abi
+1
-1
contracts/currency/currency.abi
contracts/currency/currency.abi
+1
-1
contracts/dice/dice.abi
contracts/dice/dice.abi
+1
-1
contracts/eosio.bios/eosio.bios.abi
contracts/eosio.bios/eosio.bios.abi
+1
-1
contracts/eosio.msig/eosio.msig.abi
contracts/eosio.msig/eosio.msig.abi
+1
-1
contracts/eosio.system/eosio.system.abi
contracts/eosio.system/eosio.system.abi
+1
-1
contracts/eosio.token/eosio.token.abi
contracts/eosio.token/eosio.token.abi
+1
-1
contracts/exchange/exchange.abi
contracts/exchange/exchange.abi
+1
-1
contracts/identity/identity.abi
contracts/identity/identity.abi
+1
-1
contracts/multi_index_test/multi_index_test.abi
contracts/multi_index_test/multi_index_test.abi
+1
-1
contracts/noop/noop.abi
contracts/noop/noop.abi
+1
-1
contracts/proxy/proxy.abi
contracts/proxy/proxy.abi
+1
-1
contracts/skeleton/skeleton.abi
contracts/skeleton/skeleton.abi
+1
-1
contracts/stltest/stltest.abi
contracts/stltest/stltest.abi
+1
-1
contracts/tic_tac_toe/tic_tac_toe.abi
contracts/tic_tac_toe/tic_tac_toe.abi
+1
-1
libraries/chain/contracts/chain_initializer.cpp
libraries/chain/contracts/chain_initializer.cpp
+2
-2
libraries/chain/include/eosio/chain/contracts/types.hpp
libraries/chain/include/eosio/chain/contracts/types.hpp
+3
-3
tests/tests/abi_tests.cpp
tests/tests/abi_tests.cpp
+25
-25
未找到文件。
contracts/asserter/asserter.abi
浏览文件 @
77110fa4
...
...
@@ -31,5 +31,5 @@
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
contracts/currency/currency.abi
浏览文件 @
77110fa4
...
...
@@ -83,5 +83,5 @@
"key_types" : ["uint64"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/dice/dice.abi
浏览文件 @
77110fa4
...
...
@@ -213,5 +213,5 @@
"type": "account"
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/eosio.bios/eosio.bios.abi
浏览文件 @
77110fa4
...
...
@@ -76,5 +76,5 @@
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
contracts/eosio.msig/eosio.msig.abi
浏览文件 @
77110fa4
...
...
@@ -125,5 +125,5 @@
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/eosio.system/eosio.system.abi
浏览文件 @
77110fa4
...
...
@@ -239,5 +239,5 @@
],
"tables": [
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/eosio.token/eosio.token.abi
浏览文件 @
77110fa4
...
...
@@ -72,5 +72,5 @@
"key_types" : ["uint64"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/exchange/exchange.abi
浏览文件 @
77110fa4
...
...
@@ -160,5 +160,5 @@
"key_types" : ["uint64"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/identity/identity.abi
浏览文件 @
77110fa4
...
...
@@ -112,5 +112,5 @@
"key_types": [ "account_name" ]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/multi_index_test/multi_index_test.abi
浏览文件 @
77110fa4
...
...
@@ -15,5 +15,5 @@
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
contracts/noop/noop.abi
浏览文件 @
77110fa4
...
...
@@ -21,5 +21,5 @@
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
contracts/proxy/proxy.abi
浏览文件 @
77110fa4
...
...
@@ -35,5 +35,5 @@
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/skeleton/skeleton.abi
浏览文件 @
77110fa4
...
...
@@ -35,5 +35,5 @@
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/stltest/stltest.abi
浏览文件 @
77110fa4
...
...
@@ -41,5 +41,5 @@
"key_types" : ["my_account_name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
contracts/tic_tac_toe/tic_tac_toe.abi
浏览文件 @
77110fa4
...
...
@@ -76,5 +76,5 @@
"key_types" : ["account_name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
libraries/chain/contracts/chain_initializer.cpp
浏览文件 @
77110fa4
...
...
@@ -76,7 +76,7 @@ abi_def chain_initializer::eos_contract_abi(const abi_def& eosio_system_abi)
eos_abi
.
actions
.
push_back
(
action_def
{
name
(
"onblock"
),
"onblock"
,
""
}
);
eos_abi
.
actions
.
push_back
(
action_def
{
name
(
"canceldelay"
),
"canceldelay"
,
""
}
);
// TODO add any clauses
// TODO add any
ricardian_
clauses
//
// ACTION PAYLOADS
...
...
@@ -304,7 +304,7 @@ abi_def chain_initializer::eos_contract_abi(const abi_def& eosio_system_abi)
{
"structs"
,
"struct_def[]"
},
{
"actions"
,
"action_def[]"
},
{
"tables"
,
"table_def[]"
},
{
"clauses"
,
"clause_pair[]"
}
{
"
ricardian_
clauses"
,
"clause_pair[]"
}
}
});
...
...
libraries/chain/include/eosio/chain/contracts/types.hpp
浏览文件 @
77110fa4
...
...
@@ -102,14 +102,14 @@ struct clause_pair {
struct
abi_def
{
abi_def
()
=
default
;
abi_def
(
const
vector
<
type_def
>&
types
,
const
vector
<
struct_def
>&
structs
,
const
vector
<
action_def
>&
actions
,
const
vector
<
table_def
>&
tables
,
const
vector
<
clause_pair
>&
clauses
)
:
types
(
types
),
structs
(
structs
),
actions
(
actions
),
tables
(
tables
),
clauses
(
clauses
)
:
types
(
types
),
structs
(
structs
),
actions
(
actions
),
tables
(
tables
),
ricardian_
clauses
(
clauses
)
{}
vector
<
type_def
>
types
;
vector
<
struct_def
>
structs
;
vector
<
action_def
>
actions
;
vector
<
table_def
>
tables
;
vector
<
clause_pair
>
clauses
;
vector
<
clause_pair
>
ricardian_
clauses
;
};
struct
newaccount
{
...
...
@@ -301,7 +301,7 @@ FC_REFLECT( eosio::chain::contracts::struct_def , (name)(b
FC_REFLECT
(
eosio
::
chain
::
contracts
::
action_def
,
(
name
)(
type
)(
ricardian_contract
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
clause_pair
,
(
id
)(
body
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
table_def
,
(
name
)(
index_type
)(
key_names
)(
key_types
)(
type
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
abi_def
,
(
types
)(
structs
)(
actions
)(
tables
)(
clauses
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
abi_def
,
(
types
)(
structs
)(
actions
)(
tables
)(
ricardian_
clauses
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
newaccount
,
(
creator
)(
name
)(
owner
)(
active
)(
recovery
)
)
FC_REFLECT
(
eosio
::
chain
::
contracts
::
setcode
,
(
account
)(
vmtype
)(
vmversion
)(
code
)
)
//abi
...
...
tests/tests/abi_tests.cpp
浏览文件 @
77110fa4
...
...
@@ -328,7 +328,7 @@ const char* my_abi = R"=====(
],
"actions": [],
"tables": [],
"clauses": [{"id":"clause A","body":"clause body A"},
"
ricardian_
clauses": [{"id":"clause A","body":"clause body A"},
{"id":"clause B","body":"clause body B"}]
}
)====="
;
...
...
@@ -358,7 +358,7 @@ BOOST_AUTO_TEST_CASE(uint_types)
}],
"actions": [],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -654,7 +654,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_all_types, abi_gen_helper)
"type" : "test_struct"
}],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)=====";
BOOST_TEST( generate_abi(all_types, all_types_abi) == true);
...
...
@@ -895,7 +895,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_all_indexes, abi_gen_helper)
},
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1053,7 +1053,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_full_table_decl, abi_gen_helper)
"uint64"
]
}],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1105,7 +1105,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_str_table_decl, abi_gen_helper)
"type": "table1"
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1203,7 +1203,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_template_base, abi_gen_helper)
"uint64"
]
}],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1255,7 +1255,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_action_and_table, abi_gen_helper)
"uint64"
]
}],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1319,7 +1319,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_simple_typedef, abi_gen_helper)
"ricardian_contract" : ""
}],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1397,7 +1397,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_field_typedef, abi_gen_helper)
"uint64"
]
}],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1465,7 +1465,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_vector_of_POD, abi_gen_helper)
"type": "table1"
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1549,7 +1549,7 @@ BOOST_FIXTURE_TEST_CASE(abigen_vector_of_structs, abi_gen_helper)
"type": "table1"
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1640,7 +1640,7 @@ BOOST_FIXTURE_TEST_CASE(abgigen_vector_alias, abi_gen_helper)
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1700,7 +1700,7 @@ BOOST_FIXTURE_TEST_CASE(abgigen_eosioabi_macro, abi_gen_helper)
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1773,7 +1773,7 @@ BOOST_FIXTURE_TEST_CASE(abgigen_contract_inheritance, abi_gen_helper)
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -1957,20 +1957,20 @@ BOOST_AUTO_TEST_CASE(general)
"structs" : [{"name":"struct1", "base":"base1", "fields": [{"name":"name1", "type": "type1"}, {"name":"name2", "type": "type2"}] }],
"actions" : [{"name":"action1","type":"type1", "ricardian_contract":""}],
"tables" : [{"name":"table1","index_type":"indextype1","key_names":["keyname1"],"key_types":["typename1"],"type":"type1"}],
"clauses": []
"
ricardian_
clauses": []
},
"abidef_arr": [{
"types" : [{"new_type_name":"new", "type":"old"}],
"structs" : [{"name":"struct1", "base":"base1", "fields": [{"name":"name1", "type": "type1"}, {"name":"name2", "type": "type2"}] }],
"actions" : [{"name":"action1","type":"type1", "ricardian_contract":""}],
"tables" : [{"name":"table1","index_type":"indextype1","key_names":["keyname1"],"key_types":["typename1"],"type":"type1"}],
"clauses": []
"
ricardian_
clauses": []
},{
"types" : [{"new_type_name":"new", "type":"old"}],
"structs" : [{"name":"struct1", "base":"base1", "fields": [{"name":"name1", "type": "type1"}, {"name":"name2", "type": "type2"}] }],
"actions" : [{"name":"action1","type":"type1", "ricardian_contract": ""}],
"tables" : [{"name":"table1","index_type":"indextype1","key_names":["keyname1"],"key_types":["typename1"],"type":"type1"}],
"clauses": []
"
ricardian_
clauses": []
}]
}
)====="
;
...
...
@@ -1995,7 +1995,7 @@ BOOST_AUTO_TEST_CASE(abi_cycle)
"structs": [],
"actions": [],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -2017,7 +2017,7 @@ BOOST_AUTO_TEST_CASE(abi_cycle)
}],
"actions": [],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -2437,7 +2437,7 @@ BOOST_AUTO_TEST_CASE(setabi)
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
}
)====="
;
...
...
@@ -2803,7 +2803,7 @@ BOOST_AUTO_TEST_CASE(packed_transaction)
}
],
"tables": [],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
fc
::
variant
var
;
...
...
@@ -2879,7 +2879,7 @@ BOOST_AUTO_TEST_CASE(abi_type_repeat)
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -2936,7 +2936,7 @@ BOOST_AUTO_TEST_CASE(abi_struct_repeat)
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
@@ -2996,7 +2996,7 @@ BOOST_AUTO_TEST_CASE(abi_action_repeat)
"key_types" : ["name"]
}
],
"clauses": []
"
ricardian_
clauses": []
}
)====="
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录