Skip to content

RefundEscrow's events renamed #1418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nventuro merged 23 commits into from
Oct 16, 2018
Merged

RefundEscrow's events renamed #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f2e5ed1
signing prefix added
Aniket-Engg Mar 10, 2018
ebdae17
Merge branch 'master' into master
Aniket-Engg Mar 13, 2018
2bf341c
Minor improvement
Aniket-Engg Mar 13, 2018
27c614a
Merge branch 'master' of https://github.com/Aniket-Engg/zeppelin-soli…
Aniket-Engg Mar 13, 2018
bc7ea7a
Tests changed
Aniket-Engg Mar 13, 2018
5a72021
Successfully tested
Aniket-Engg Mar 13, 2018
de0d2d4
Minor improvements
Aniket-Engg Mar 13, 2018
7f32e5c
Minor improvements
Aniket-Engg Mar 13, 2018
c3fb8a8
minor changes
Aniket-Engg Oct 1, 2018
68de840
Revert "Dangling commas are now required. (#1359)"
Aniket-Engg Oct 1, 2018
92b725f
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 1, 2018
1fe2cdf
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 1, 2018
75bc310
updates
Aniket-Engg Oct 1, 2018
9d9a5a0
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 3, 2018
10b1898
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 4, 2018
3858a0c
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 4, 2018
9484daa
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 5, 2018
5139019
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 8, 2018
3097a48
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 9, 2018
a46e176
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 10, 2018
fc9d1a7
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 11, 2018
52c7870
Merge remote-tracking branch 'upstream/master'
Aniket-Engg Oct 16, 2018
ee7451f
fixes #1414
Aniket-Engg Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/payment/RefundEscrow.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import "./ConditionalEscrow.sol";
contract RefundEscrow is ConditionalEscrow {
enum State { Active, Refunding, Closed }

event Closed();
event RefundsClosed();
event RefundsEnabled();

State private _state;
Expand Down Expand Up @@ -57,7 +57,7 @@ contract RefundEscrow is ConditionalEscrow {
function close() public onlyPrimary {
require(_state == State.Active);
_state = State.Closed;
emit Closed();
emit RefundsClosed();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion test/payment/RefundEscrow.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ contract('RefundEscrow', function ([_, primary, beneficiary, refundee1, refundee
await shouldFail.reverting(this.escrow.close({ from: beneficiary }));

const { logs } = await this.escrow.close({ from: primary });
expectEvent.inLogs(logs, 'Closed');
expectEvent.inLogs(logs, 'RefundsClosed');
});

context('closed state', function () {
Expand Down