From b7b5b153a6d742fa0fda4c8d92695a2fa08adc90 Mon Sep 17 00:00:00 2001 From: Denis Carriere Date: Sat, 11 May 2019 12:57:12 -0400 Subject: [PATCH] Rename auditor => approver fixes https://github.com/EOS-Nation/escrow.bos/issues/4 --- README.md | 10 ++-- escrow.abi | 4 +- escrow.cpp | 24 ++++----- escrow.hpp | 2 +- escrow_shared.hpp | 2 +- tests/contract_spec.rb | 120 ++++++++++++++++++++--------------------- 6 files changed, 81 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index e467f82..86aa0b7 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ An escrow contract designed for paying worker proposals. The intention is that - The sender of an escrow will temporarily be whitelisted to BOS executives. In the future anyone may be a sender - The sender may only have one unfilled escrow at any given time, however they may have many filled escrows - To fill an escrow the sender must transfer the `BOS` tokens to this contract. An unfilled escrow will be filled -- The receiver is considered as always approving the escrow. An approval must come from either the sender or the auditor +- The receiver is considered as always approving the escrow. An approval must come from either the sender or the approver - The sender may only cancel an escrow that has not been filled - The sender may only refund an escrow that has passed it's expiry - Unapprove only removes an existing approval, if the action is made before the receiver uses the claim action - A sender may extend the expiry but not shorten it -- The auditor may change extend or shorten the expiry -- The auditor may close an escrow. This is essentially the same as refunding it, however without waiting for the expiry to lapse -- The auditor may Lock and Unlock an escrow. This prevents ALL actions except unlock and actions made by the auditor. +- The approver may change extend or shorten the expiry +- The approver may close an escrow. This is essentially the same as refunding it, however without waiting for the expiry to lapse +- The approver may Lock and Unlock an escrow. This prevents ALL actions except unlock and actions made by the approver.

init @@ -27,7 +27,7 @@ An escrow contract designed for paying worker proposals. The intention is that - __sender__ is an eosio account name. - __receiver__ is an eosio account name. -- __auditor__ is an eosio account name. +- __approver__ is an eosio account name. - __expires__ The date/time after which the escrow amount can be refunded by the sender. - __memo__ is a memo to send as the eventual transfer memo at the end of the escrow contract. - __ext_reference__ is a reference to to external id held my another contract or entity as opposed to the internal auto-incrementing key. diff --git a/escrow.abi b/escrow.abi index be223c9..12848c5 100644 --- a/escrow.abi +++ b/escrow.abi @@ -113,7 +113,7 @@ "type": "name" }, { - "name": "auditor", + "name": "approver", "type": "name" }, { @@ -183,7 +183,7 @@ "type": "name" }, { - "name": "auditor", + "name": "approver", "type": "name" }, { diff --git a/escrow.cpp b/escrow.cpp index d7779de..a8feb20 100644 --- a/escrow.cpp +++ b/escrow.cpp @@ -49,7 +49,7 @@ namespace bos { eosio_assert(found, "Could not find existing escrow to deposit to, transfer cancelled"); } - ACTION escrow::init(name sender, name receiver, name auditor, time_point_sec expires, string memo, std::optional ext_reference ) { + ACTION escrow::init(name sender, name receiver, name approver, time_point_sec expires, string memo, std::optional ext_reference ) { require_auth(sender); // Ensure sender is a BOS Executive @@ -81,7 +81,7 @@ namespace bos { p.key = escrows.available_primary_key(); p.sender = sender; p.receiver = receiver; - p.auditor = auditor; + p.approver = approver; p.ext_asset = zero_asset; p.expires = expires; p.memo = memo; @@ -102,7 +102,7 @@ namespace bos { eosio_assert(esc_itr->ext_asset.quantity.amount > 0, "This has not been initialized with a transfer"); - eosio_assert(esc_itr->sender == approver || esc_itr->auditor == approver, "You are not allowed to approve this escrow."); + eosio_assert(esc_itr->sender == approver || esc_itr->approver == approver, "You are not allowed to approve this escrow."); auto approvals = esc_itr->approvals; eosio_assert(std::find(approvals.begin(), approvals.end(), approver) == approvals.end(), "You have already approved this escrow"); @@ -146,7 +146,7 @@ namespace bos { eosio_assert(esc_itr->ext_asset.quantity.amount > 0, "This has not been initialized with a transfer"); - eosio_assert(esc_itr->locked == false, "This escrow has been locked by the auditor"); + eosio_assert(esc_itr->locked == false, "This escrow has been locked by the approver"); auto approvals = esc_itr->approvals; @@ -204,7 +204,7 @@ namespace bos { eosio_assert(esc_itr->ext_asset.quantity.amount > 0, "This has not been initialized with a transfer"); - eosio_assert(esc_itr->locked == false, "This escrow has been locked by the auditor"); + eosio_assert(esc_itr->locked == false, "This escrow has been locked by the approver"); time_point_sec time_now = time_point_sec(current_time_point()); @@ -239,12 +239,12 @@ namespace bos { time_point_sec time_now = time_point_sec(current_time_point()); - //auditors may extend or shorten the time - //the sender may only extend + // approver may extend or shorten the time + // the sender may only extend if(has_auth(esc_itr->sender)) { eosio_assert(expires > esc_itr->expires, "You may only extend the expiry"); } else { - require_auth(esc_itr->auditor); + require_auth(esc_itr->approver); } escrows.modify(esc_itr, eosio::same_payer, [&](escrow_info &e){ @@ -262,13 +262,13 @@ namespace bos { /* - * Allows the auditor to close and refund an unexpired escrow + * Allows the approver to close and refund an unexpired escrow */ ACTION escrow::close(uint64_t key) { auto esc_itr = escrows.find(key); eosio_assert(esc_itr != escrows.end(), "Could not find escrow with that index"); - require_auth(esc_itr->auditor); + require_auth(esc_itr->approver); eosio_assert(esc_itr->ext_asset.quantity.amount > 0, "This has not been initialized with a transfer"); eosio::action( @@ -287,13 +287,13 @@ namespace bos { } /* - * Allows the auditor to lock an escrow preventing any actions by sender or receiver + * Allows the approver to lock an escrow preventing any actions by sender or receiver */ ACTION escrow::lock(uint64_t key, bool locked) { auto esc_itr = escrows.find(key); eosio_assert(esc_itr != escrows.end(), "Could not find escrow with that index"); - require_auth(esc_itr->auditor); + require_auth(esc_itr->approver); eosio_assert(esc_itr->ext_asset.quantity.amount > 0, "This has not been initialized with a transfer"); escrows.modify(esc_itr, eosio::same_payer, [&](escrow_info &e){ diff --git a/escrow.hpp b/escrow.hpp index 4d18b42..e6259d0 100644 --- a/escrow.hpp +++ b/escrow.hpp @@ -28,7 +28,7 @@ namespace bos { * Escrow contract */ - ACTION init(name sender, name receiver, name auditor, time_point_sec expires, string memo, std::optional ext_reference); + ACTION init(name sender, name receiver, name approver, time_point_sec expires, string memo, std::optional ext_reference); ACTION transfer(name from, name to, asset quantity, string memo); diff --git a/escrow_shared.hpp b/escrow_shared.hpp index 02d9858..73f27d9 100644 --- a/escrow_shared.hpp +++ b/escrow_shared.hpp @@ -10,7 +10,7 @@ struct [[eosio::table("escrows"), eosio::contract("escrow")]] escrow_info { uint64_t key; name sender; name receiver; - name auditor; + name approver; vector approvals; extended_asset ext_asset; string memo; diff --git a/tests/contract_spec.rb b/tests/contract_spec.rb index 48f8965..19008cc 100644 --- a/tests/contract_spec.rb +++ b/tests/contract_spec.rb @@ -225,17 +225,17 @@ def killchain describe "init" do context "Without valid permission" do context "with valid and registered member" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": null}' -p sender2), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": null}' -p sender2), allow_error: true its(:stderr) {is_expected.to include('missing authority of sender1')} end end context "with valid auth" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": null}' -p sender1), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": null}' -p sender1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::init')} context "with an existing escrow entry" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some other memo", "ext_reference": null}' -p sender1), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some other memo", "ext_reference": null}' -p sender1), allow_error: true its(:stderr) {is_expected.to include('You already have an empty escrow. Either fill it or delete it')} end end @@ -249,7 +249,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity":"0.0000 BOS", "contract":"eosio.token"}, "memo": "some memo", @@ -311,7 +311,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity":"5.0000 BOS", "contract":"eosio.token"}, "memo": "some memo", @@ -340,7 +340,7 @@ def killchain context "with valid escrow id" do context "before a corresponding transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender2", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "another empty escrow", "ext_reference": null}' -p sender2` + `cleos push action dacescrow init '{"sender": "sender2", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "another empty escrow", "ext_reference": null}' -p sender2` end command %(cleos push action dacescrow approve '{ "key": 1, "approver": "arb1"}' -p arb1), allow_error: true its(:stderr) {is_expected.to include('This has not been initialized with a transfer')} @@ -371,7 +371,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [ "arb1" ], @@ -384,7 +384,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity":"0.0000 BOS", "contract":"eosio.token"}, "memo": "another empty escrow", @@ -425,11 +425,11 @@ def killchain context "after an escrow is locked" do context "sender may not refund" do command %(cleos push action dacescrow refund '{ "key": 0}' -p sender1), allow_error: true - its(:stderr) {is_expected.to include('This escrow has been locked by the auditor')} + its(:stderr) {is_expected.to include('This escrow has been locked by the approver')} end context "receiver may not claim" do command %(cleos push action dacescrow claim '{ "key": 0}' -p receiver1), allow_error: true - its(:stderr) {is_expected.to include('This escrow has been locked by the auditor')} + its(:stderr) {is_expected.to include('This escrow has been locked by the approver')} end context "Read the escrow table after lock" do command %(cleos get table dacescrow dacescrow escrows), allow_error: true @@ -441,7 +441,7 @@ def killchain "locked": 1, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [ "arb1" ], @@ -454,7 +454,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity":"0.0000 BOS", "contract":"eosio.token"}, "memo": "another empty escrow", @@ -467,7 +467,7 @@ def killchain JSON end end - context "auditor may unlock escrow" do + context "approver may unlock escrow" do command %(cleos push action dacescrow lock '{ "key": 0, "locked": 0}' -p arb1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::lock')} end @@ -517,7 +517,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": ["sender1"], "ext_asset": {"quantity":"5.0000 BOS", "contract":"eosio.token"}, "memo": "some memo", @@ -528,7 +528,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity":"0.0000 BOS", "contract":"eosio.token"}, "memo": "another empty escrow", @@ -591,7 +591,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -626,7 +626,7 @@ def killchain end context "before a transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "third memo", "ext_reference": null}' -p sender1` + `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "third memo", "ext_reference": null}' -p sender1` end command %(cleos push action dacescrow cancel '{ "key": 2}' -p sender1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::cancel')} @@ -641,7 +641,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -671,7 +671,7 @@ def killchain context "with valid auth" do context "before a corresponding transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "some empty memo", "ext_reference": null}' -p sender1` + `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "some empty memo", "ext_reference": null}' -p sender1` end command %(cleos push action dacescrow refund '{ "key": 2 }' -p sender1), allow_error: true its(:stderr) {is_expected.to include('This has not been initialized with a transfer')} @@ -679,7 +679,7 @@ def killchain context "after a transfer has been made" do context "before the escrow has expired" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender4", "receiver": "receiver1", "auditor": "arb2", "expires": "2035-01-20T23:21:43.528", "memo": "distant future escrow", "ext_reference": null}' -p sender4` + `cleos push action dacescrow init '{"sender": "sender4", "receiver": "receiver1", "approver": "arb2", "expires": "2035-01-20T23:21:43.528", "memo": "distant future escrow", "ext_reference": null}' -p sender4` `cleos push action eosio.token transfer '{"from": "sender4", "to": "dacescrow", "quantity": "5.0000 BOS", "memo": "here is a memo" }' -p sender4` `cleos push action dacescrow approve '{ "key": 3, "approver": "sender4"}' -p sender4` end @@ -710,7 +710,7 @@ def killchain end context "after the escrow has expired" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender3", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-19T23:21:43.528", "memo": "some expired memo", "ext_reference": null}' -p sender3` + `cleos push action dacescrow init '{"sender": "sender3", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-19T23:21:43.528", "memo": "some expired memo", "ext_reference": null}' -p sender3` `cleos push action eosio.token transfer '{"from": "sender3", "to": "dacescrow", "quantity": "5.0000 BOS", "memo": "here is a memo" }' -p sender3` `cleos push action dacescrow approve '{ "key": 4, "approver": "sender3"}' -p sender3` end @@ -763,7 +763,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -774,7 +774,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -785,7 +785,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ], @@ -821,7 +821,7 @@ def killchain its(:stdout) {is_expected.to include('dacescrow <= dacescrow::extend')} end end - context "with valid auditor auth" do + context "with valid approver auth" do context "with a shorter expiry time" do command %(cleos push action dacescrow extend '{ "key": 3, "expires": "2025-01-20T23:21:43"}' -p arb2), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::extend')} @@ -842,7 +842,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -853,7 +853,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -864,7 +864,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ], @@ -946,7 +946,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -957,7 +957,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ], @@ -983,17 +983,17 @@ def killchain end context "Without valid permission" do context "with valid and registered member" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": 23}' -p sender2), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": 23}' -p sender2), allow_error: true its(:stderr) {is_expected.to include('missing authority of sender1')} end end context "with valid auth" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": 23}' -p sender1), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some memo", "ext_reference": 23}' -p sender1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::init')} context "with an existing escrow entry" do - command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some other memo", "ext_reference": 23}' -p sender1), allow_error: true + command %(cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "some other memo", "ext_reference": 23}' -p sender1), allow_error: true its(:stderr) {is_expected.to include('You already have an empty escrow. Either fill it or delete it')} end end @@ -1007,7 +1007,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some memo", @@ -1069,7 +1069,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "5.0000 BOS", "contract": "eosio.token"}, "memo": "some memo", @@ -1097,7 +1097,7 @@ def killchain context "with valid escrow id" do context "before a corresponding transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender2", "receiver": "receiver1", "auditor": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "another empty escrow", "ext_reference": "666"}' -p sender2` + `cleos push action dacescrow init '{"sender": "sender2", "receiver": "receiver1", "approver": "arb1", "expires": "2019-01-20T23:21:43.528", "memo": "another empty escrow", "ext_reference": "666"}' -p sender2` end command %(cleos push action dacescrow approveext '{ "ext_key": 666, "approver": "arb1"}' -p arb1), allow_error: true its(:stderr) {is_expected.to include('This has not been initialized with a transfer')} @@ -1128,7 +1128,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [ "arb1" ], @@ -1141,7 +1141,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1183,11 +1183,11 @@ def killchain context "after an escrow is locked" do context "sender may not refund" do command %(cleos push action dacescrow refundext '{ "ext_key": 23}' -p sender1), allow_error: true - its(:stderr) {is_expected.to include('This escrow has been locked by the auditor')} + its(:stderr) {is_expected.to include('This escrow has been locked by the approver')} end context "receiver may not claim" do command %(cleos push action dacescrow claimext '{ "ext_key": 23}' -p receiver1), allow_error: true - its(:stderr) {is_expected.to include('This escrow has been locked by the auditor')} + its(:stderr) {is_expected.to include('This escrow has been locked by the approver')} end context "Read the escrow table after lock" do command %(cleos get table dacescrow dacescrow escrows), allow_error: true @@ -1199,7 +1199,7 @@ def killchain "locked": 1, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [ "arb1" ], @@ -1212,7 +1212,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1225,7 +1225,7 @@ def killchain JSON end end - context "auditor may unlock escrow" do + context "approver may unlock escrow" do command %(cleos push action dacescrow lockext '{ "ext_key": 23, "locked": 0}' -p arb1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::lockext')} end @@ -1275,7 +1275,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": ["sender1"], "ext_asset": {"quantity": "5.0000 BOS", "contract": "eosio.token"}, "memo": "some memo", @@ -1286,7 +1286,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1349,7 +1349,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1384,7 +1384,7 @@ def killchain end context "before a transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "third memo", "ext_reference": 777}' -p sender1` + `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "third memo", "ext_reference": 777}' -p sender1` end command %(cleos push action dacescrow cancelext '{ "ext_key": 777}' -p sender1), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::cancel')} @@ -1399,7 +1399,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1429,7 +1429,7 @@ def killchain context "with valid auth" do context "before a corresponding transfer has been made" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "some empty memo", "ext_reference": 821}' -p sender1` + `cleos push action dacescrow init '{"sender": "sender1", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-20T23:21:43.528", "memo": "some empty memo", "ext_reference": 821}' -p sender1` end command %(cleos push action dacescrow refundext '{ "ext_key": 821 }' -p sender1), allow_error: true its(:stderr) {is_expected.to include('This has not been initialized with a transfer')} @@ -1437,7 +1437,7 @@ def killchain context "after a transfer has been made" do context "before the escrow has expired" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender4", "receiver": "receiver1", "auditor": "arb2", "expires": "2035-01-20T23:21:43.528", "memo": "distant future escrow", "ext_reference": 123}' -p sender4` + `cleos push action dacescrow init '{"sender": "sender4", "receiver": "receiver1", "approver": "arb2", "expires": "2035-01-20T23:21:43.528", "memo": "distant future escrow", "ext_reference": 123}' -p sender4` `cleos push action eosio.token transfer '{"from": "sender4", "to": "dacescrow", "quantity": "5.0000 BOS", "memo": "here is a memo" }' -p sender4` `cleos push action dacescrow approveext '{ "ext_key": 123, "approver": "sender4"}' -p sender4` end @@ -1468,7 +1468,7 @@ def killchain end context "after the escrow has expired" do before(:all) do - `cleos push action dacescrow init '{"sender": "sender3", "receiver": "receiver1", "auditor": "arb2", "expires": "2019-01-19T23:21:43.528", "memo": "some expired memo", "ext_reference": 456}' -p sender3` + `cleos push action dacescrow init '{"sender": "sender3", "receiver": "receiver1", "approver": "arb2", "expires": "2019-01-19T23:21:43.528", "memo": "some expired memo", "ext_reference": 456}' -p sender3` `cleos push action eosio.token transfer '{"from": "sender3", "to": "dacescrow", "quantity": "5.0000 BOS", "memo": "here is a memo" }' -p sender3` `cleos push action dacescrow approveext '{ "ext_key": 456, "approver": "sender3"}' -p sender3` end @@ -1521,7 +1521,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1532,7 +1532,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -1543,7 +1543,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ], @@ -1582,7 +1582,7 @@ def killchain its(:stdout) {is_expected.to include('dacescrow <= dacescrow::extendext')} end end - context "with valid auditor auth" do + context "with valid approver auth" do context "with a shorter expiry time" do command %(cleos push action dacescrow extendext '{ "ext_key": 123, "expires": "2025-01-20T23:21:43"}' -p arb2), allow_error: true its(:stdout) {is_expected.to include('dacescrow <= dacescrow::extendext')} @@ -1603,7 +1603,7 @@ def killchain "locked": 0, "sender": "sender2", "receiver": "receiver1", - "auditor": "arb1", + "approver": "arb1", "approvals": [], "ext_asset": {"quantity": "6.0000 BOS", "contract": "eosio.token"}, "memo": "another empty escrow", @@ -1614,7 +1614,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -1625,7 +1625,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ], @@ -1705,7 +1705,7 @@ def killchain "locked": 0, "sender": "sender1", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [], "ext_asset": {"quantity": "0.0000 BOS", "contract": "eosio.token"}, "memo": "some empty memo", @@ -1716,7 +1716,7 @@ def killchain "locked": 0, "sender": "sender4", "receiver": "receiver1", - "auditor": "arb2", + "approver": "arb2", "approvals": [ "sender4" ],