From 77110fa4e721b89fd1769333a23db94a75c7f082 Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 12 Apr 2018 23:53:29 -0400 Subject: [PATCH] Renamed clauses to ricardian_clauses --- contracts/asserter/asserter.abi | 2 +- contracts/currency/currency.abi | 2 +- contracts/dice/dice.abi | 2 +- contracts/eosio.bios/eosio.bios.abi | 2 +- contracts/eosio.msig/eosio.msig.abi | 2 +- contracts/eosio.system/eosio.system.abi | 2 +- contracts/eosio.token/eosio.token.abi | 2 +- contracts/exchange/exchange.abi | 2 +- contracts/identity/identity.abi | 2 +- .../multi_index_test/multi_index_test.abi | 2 +- contracts/noop/noop.abi | 2 +- contracts/proxy/proxy.abi | 2 +- contracts/skeleton/skeleton.abi | 2 +- contracts/stltest/stltest.abi | 2 +- contracts/tic_tac_toe/tic_tac_toe.abi | 2 +- .../chain/contracts/chain_initializer.cpp | 4 +- .../include/eosio/chain/contracts/types.hpp | 6 +-- tests/tests/abi_tests.cpp | 50 +++++++++---------- 18 files changed, 45 insertions(+), 45 deletions(-) diff --git a/contracts/asserter/asserter.abi b/contracts/asserter/asserter.abi index 67a45d699..d42fc9e09 100644 --- a/contracts/asserter/asserter.abi +++ b/contracts/asserter/asserter.abi @@ -31,5 +31,5 @@ } ], "tables": [], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/currency/currency.abi b/contracts/currency/currency.abi index 23eb3a909..1c677759c 100644 --- a/contracts/currency/currency.abi +++ b/contracts/currency/currency.abi @@ -83,5 +83,5 @@ "key_types" : ["uint64"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/dice/dice.abi b/contracts/dice/dice.abi index b1786de9a..154f021c6 100644 --- a/contracts/dice/dice.abi +++ b/contracts/dice/dice.abi @@ -213,5 +213,5 @@ "type": "account" } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/eosio.bios/eosio.bios.abi b/contracts/eosio.bios/eosio.bios.abi index 474bd4095..416fa4338 100644 --- a/contracts/eosio.bios/eosio.bios.abi +++ b/contracts/eosio.bios/eosio.bios.abi @@ -76,5 +76,5 @@ } ], "tables": [], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/eosio.msig/eosio.msig.abi b/contracts/eosio.msig/eosio.msig.abi index 1fd55b877..9aa202386 100644 --- a/contracts/eosio.msig/eosio.msig.abi +++ b/contracts/eosio.msig/eosio.msig.abi @@ -125,5 +125,5 @@ "key_types" : ["name"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/eosio.system/eosio.system.abi b/contracts/eosio.system/eosio.system.abi index e338998ef..1d47e2e0d 100644 --- a/contracts/eosio.system/eosio.system.abi +++ b/contracts/eosio.system/eosio.system.abi @@ -239,5 +239,5 @@ ], "tables": [ ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/eosio.token/eosio.token.abi b/contracts/eosio.token/eosio.token.abi index fc2a35923..513d175b4 100644 --- a/contracts/eosio.token/eosio.token.abi +++ b/contracts/eosio.token/eosio.token.abi @@ -72,5 +72,5 @@ "key_types" : ["uint64"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/exchange/exchange.abi b/contracts/exchange/exchange.abi index 4dbf618df..5481c8cef 100644 --- a/contracts/exchange/exchange.abi +++ b/contracts/exchange/exchange.abi @@ -160,5 +160,5 @@ "key_types" : ["uint64"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/identity/identity.abi b/contracts/identity/identity.abi index 2808fdbb0..c9e1605ef 100644 --- a/contracts/identity/identity.abi +++ b/contracts/identity/identity.abi @@ -112,5 +112,5 @@ "key_types": [ "account_name" ] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/multi_index_test/multi_index_test.abi b/contracts/multi_index_test/multi_index_test.abi index 8ac4553ff..3eafc1c1c 100644 --- a/contracts/multi_index_test/multi_index_test.abi +++ b/contracts/multi_index_test/multi_index_test.abi @@ -15,5 +15,5 @@ } ], "tables": [], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/noop/noop.abi b/contracts/noop/noop.abi index bf2021c23..323cc24ab 100644 --- a/contracts/noop/noop.abi +++ b/contracts/noop/noop.abi @@ -21,5 +21,5 @@ } ], "tables": [], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/proxy/proxy.abi b/contracts/proxy/proxy.abi index 4554182c2..0449aaf85 100644 --- a/contracts/proxy/proxy.abi +++ b/contracts/proxy/proxy.abi @@ -35,5 +35,5 @@ "key_types" : ["name"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/skeleton/skeleton.abi b/contracts/skeleton/skeleton.abi index d282123fa..5e32bf0fc 100644 --- a/contracts/skeleton/skeleton.abi +++ b/contracts/skeleton/skeleton.abi @@ -35,5 +35,5 @@ "key_types" : ["name"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/stltest/stltest.abi b/contracts/stltest/stltest.abi index 5603dbd1e..69f33e29c 100644 --- a/contracts/stltest/stltest.abi +++ b/contracts/stltest/stltest.abi @@ -41,5 +41,5 @@ "key_types" : ["my_account_name"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/contracts/tic_tac_toe/tic_tac_toe.abi b/contracts/tic_tac_toe/tic_tac_toe.abi index d04bcfd52..6f2bb8ec1 100644 --- a/contracts/tic_tac_toe/tic_tac_toe.abi +++ b/contracts/tic_tac_toe/tic_tac_toe.abi @@ -76,5 +76,5 @@ "key_types" : ["account_name"] } ], - "clauses": [] + "ricardian_clauses": [] } diff --git a/libraries/chain/contracts/chain_initializer.cpp b/libraries/chain/contracts/chain_initializer.cpp index 52910defc..f41cb284b 100644 --- a/libraries/chain/contracts/chain_initializer.cpp +++ b/libraries/chain/contracts/chain_initializer.cpp @@ -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[]"} } }); diff --git a/libraries/chain/include/eosio/chain/contracts/types.hpp b/libraries/chain/include/eosio/chain/contracts/types.hpp index 90cde42ac..2008bfb83 100644 --- a/libraries/chain/include/eosio/chain/contracts/types.hpp +++ b/libraries/chain/include/eosio/chain/contracts/types.hpp @@ -102,14 +102,14 @@ struct clause_pair { struct abi_def { abi_def() = default; abi_def(const vector& types, const vector& structs, const vector& actions, const vector& tables, const vector& clauses) - :types(types), structs(structs), actions(actions), tables(tables), clauses(clauses) + :types(types), structs(structs), actions(actions), tables(tables), ricardian_clauses(clauses) {} vector types; vector structs; vector actions; vector tables; - vector clauses; + vector 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 diff --git a/tests/tests/abi_tests.cpp b/tests/tests/abi_tests.cpp index 01775c978..8b0d3c970 100644 --- a/tests/tests/abi_tests.cpp +++ b/tests/tests/abi_tests.cpp @@ -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": [] } )====="; -- GitLab