From 85f0c7c1006c4a0b78ca8409b40ab253e8c547f4 Mon Sep 17 00:00:00 2001 From: zxcat <550974+zxcat@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:14:07 +0300 Subject: [PATCH] Remove abi ricardians & update eosio softmax version #452 fixes warnings --- auth-proto/deposit/deposit.abi | 4 +--- auth-proto/media/media.abi | 19 ++++++----------- cyberway.contracts | 2 +- golos.charge/golos.charge.abi | 1 - golos.config/abi/golos.config.abi | 7 ++----- golos.ctrl/abi/golos.ctrl.abi | 28 ++++++++----------------- golos.emit/abi/golos.emit.abi | 13 ++++-------- golos.publication/golos.publication.abi | 1 - golos.referral/abi/golos.referral.abi | 13 ++++-------- golos.social/golos.social.abi | 1 - golos.vesting/golos.vesting.abi | 7 ++----- tests/CMakeLists.txt | 2 +- 12 files changed, 30 insertions(+), 68 deletions(-) diff --git a/auth-proto/deposit/deposit.abi b/auth-proto/deposit/deposit.abi index eb5f58f3..25894bc5 100644 --- a/auth-proto/deposit/deposit.abi +++ b/auth-proto/deposit/deposit.abi @@ -29,8 +29,7 @@ ], "actions": [{ "name": "transfer", - "type": "transfer", - "ricardian_contract": "" + "type": "transfer" } ], "tables": [{ @@ -41,7 +40,6 @@ "key_types" : ["uint64"] } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } diff --git a/auth-proto/media/media.abi b/auth-proto/media/media.abi index 36d8288b..538b769a 100644 --- a/auth-proto/media/media.abi +++ b/auth-proto/media/media.abi @@ -121,28 +121,22 @@ ], "actions": [{ "name": "publish", - "type": "publish", - "ricardian_contract": "" + "type": "publish" },{ "name": "vote", - "type": "vote", - "ricardian_contract": "" + "type": "vote" },{ "name": "vote2", - "type": "vote2", - "ricardian_contract": "" + "type": "vote2" },{ "name": "vote3", - "type": "vote3", - "ricardian_contract": "" + "type": "vote3" },{ "name": "vote4", - "type": "vote4", - "ricardian_contract": "" + "type": "vote4" },{ "name": "reward", - "type": "reward", - "ricardian_contract": "" + "type": "reward" } ], "tables": [{ @@ -177,7 +171,6 @@ "type": "data" } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } \ No newline at end of file diff --git a/cyberway.contracts b/cyberway.contracts index 95eac3da..976fb971 160000 --- a/cyberway.contracts +++ b/cyberway.contracts @@ -1 +1 @@ -Subproject commit 95eac3da5f93e5d6642920201b53f43acbd34448 +Subproject commit 976fb9715e6b1daaa6524f199b5eb5e920c70afe diff --git a/golos.charge/golos.charge.abi b/golos.charge/golos.charge.abi index 46ee51a0..8c6a5681 100644 --- a/golos.charge/golos.charge.abi +++ b/golos.charge/golos.charge.abi @@ -344,7 +344,6 @@ ] } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } diff --git a/golos.config/abi/golos.config.abi b/golos.config/abi/golos.config.abi index 7df24d3d..55b3d882 100644 --- a/golos.config/abi/golos.config.abi +++ b/golos.config/abi/golos.config.abi @@ -44,12 +44,10 @@ "actions": [ { "name": "updateparamse", - "type": "updateparamse", - "ricardian_contract": "" + "type": "updateparamse" }, { "name": "notifytop", - "type": "notifytop", - "ricardian_contract": "" + "type": "notifytop" } ], "tables": [ @@ -63,6 +61,5 @@ }] } ], - "ricardian_clauses": [], "abi_extensions": [] } diff --git a/golos.ctrl/abi/golos.ctrl.abi b/golos.ctrl/abi/golos.ctrl.abi index eb7f2351..29ad4d2e 100644 --- a/golos.ctrl/abi/golos.ctrl.abi +++ b/golos.ctrl/abi/golos.ctrl.abi @@ -146,40 +146,31 @@ "actions": [ { "name": "setparams", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "validateprms", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "attachacc", - "type": "attachacc", - "ricardian_contract": "" + "type": "attachacc" }, { "name": "detachacc", - "type": "detachacc", - "ricardian_contract": "" + "type": "detachacc" }, { "name": "regwitness", - "type": "regwitness", - "ricardian_contract": "" + "type": "regwitness" }, { "name": "unregwitness", - "type": "unregwitness", - "ricardian_contract": "" + "type": "unregwitness" }, { "name": "unvotewitn", - "type": "unvotewitn", - "ricardian_contract": "" + "type": "unvotewitn" }, { "name": "changevest", - "type": "changevest", - "ricardian_contract": "" + "type": "changevest" }, { "name": "votewitness", - "type": "votewitness", - "ricardian_contract": "" + "type": "votewitness" } ], "tables": [ @@ -229,6 +220,5 @@ }] } ], - "ricardian_clauses": [], "abi_extensions": [] } diff --git a/golos.emit/abi/golos.emit.abi b/golos.emit/abi/golos.emit.abi index 8cbf7044..31705ae1 100644 --- a/golos.emit/abi/golos.emit.abi +++ b/golos.emit/abi/golos.emit.abi @@ -69,23 +69,19 @@ "actions": [ { "name": "setparams", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "emit", - "type": "emit", - "ricardian_contract": "" + "type": "emit" }, { "name": "start", - "type": "start", - "ricardian_contract": "" + "type": "start" }, { "name": "stop", - "type": "stop", - "ricardian_contract": "" + "type": "stop" } ], "tables": [ @@ -107,6 +103,5 @@ }] } ], - "ricardian_clauses": [], "abi_extensions": [] } diff --git a/golos.publication/golos.publication.abi b/golos.publication/golos.publication.abi index cc235842..78e25c3e 100644 --- a/golos.publication/golos.publication.abi +++ b/golos.publication/golos.publication.abi @@ -935,7 +935,6 @@ ] } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } diff --git a/golos.referral/abi/golos.referral.abi b/golos.referral/abi/golos.referral.abi index 3c56979b..755a657d 100644 --- a/golos.referral/abi/golos.referral.abi +++ b/golos.referral/abi/golos.referral.abi @@ -81,23 +81,19 @@ "actions": [ { "name": "addreferral", - "type": "addreferral", - "ricardian_contract": "" + "type": "addreferral" }, { "name": "validateprms", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "setparams", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "closeoldref", - "type": "hash", - "ricardian_contract": "" + "type": "hash" } ], "tables": [ @@ -142,6 +138,5 @@ ] } ], - "ricardian_clauses": [], "abi_extensions": [] } diff --git a/golos.social/golos.social.abi b/golos.social/golos.social.abi index db4d4b3a..4e717581 100644 --- a/golos.social/golos.social.abi +++ b/golos.social/golos.social.abi @@ -307,7 +307,6 @@ ] } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } diff --git a/golos.vesting/golos.vesting.abi b/golos.vesting/golos.vesting.abi index 1df1933b..186e3e3f 100644 --- a/golos.vesting/golos.vesting.abi +++ b/golos.vesting/golos.vesting.abi @@ -331,13 +331,11 @@ "actions": [ { "name": "setparams", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "validateprms", - "type": "setparams", - "ricardian_contract": "" + "type": "setparams" }, { "name": "buyvg", @@ -475,7 +473,6 @@ }] } ], - "ricardian_clauses": [], "error_messages": [], "abi_extensions": [] } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 712b976a..ff399d67 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,7 +3,7 @@ set(BUILD_CYBERWAY_CHAINDB_MONGO TRUE CACHE BOOL "Build chaindb based on mongodb cmake_minimum_required( VERSION 3.5 ) set(EOSIO_VERSION_MIN "1.4") -set(EOSIO_VERSION_SOFT_MAX "1.4") +set(EOSIO_VERSION_SOFT_MAX "1.6") #set(EOSIO_VERSION_HARD_MAX "") find_package(eosio)