status-im
/
liquid-funding
mirror of https://github.com/status-im/liquid-funding.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

NotPaid to Pledged refactor

This commit is contained in:
Jordi Baylina 2017-10-04 10:29:41 +02:00
parent 41154e89d2
commit aaa3be9305
No known key found for this signature in database
GPG Key ID: 7480C80C1BE43112
9 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/LiquidPledging.sol.js
View File

File diff suppressed because one or more lines are too long

4
build/LiquidPledgingBase.sol.js
View File

File diff suppressed because one or more lines are too long

2
build/LiquidPledgingBase_all.sol
View File

@ -52,7 +52,7 @@ contract LiquidPledgingBase {
uint constant MAX_INTERCAMPAIGN_LEVEL = 20; uint constant MAX_INTERCAMPAIGN_LEVEL = 20;
enum PledgeAdminType { Giver, Delegate, Campaign } enum PledgeAdminType { Giver, Delegate, Campaign }
enum PaymentState { NotPaid, Paying, Paid } // TODO name change NotPaid enum PaymentState { Pledged, Paying, Paid } // TODO name change Pledged
/// @dev This struct defines the details of each the PledgeAdmin, these /// @dev This struct defines the details of each the PledgeAdmin, these
/// PledgeAdmins can own pledges and act as delegates /// PledgeAdmins can own pledges and act as delegates

8
build/LiquidPledgingMock.sol.js
View File

File diff suppressed because one or more lines are too long

28
build/LiquidPledgingMock_all.sol
View File

@ -52,7 +52,7 @@ contract LiquidPledgingBase {
uint constant MAX_INTERCAMPAIGN_LEVEL = 20; uint constant MAX_INTERCAMPAIGN_LEVEL = 20;
enum PledgeAdminType { Giver, Delegate, Campaign } enum PledgeAdminType { Giver, Delegate, Campaign }
enum PaymentState { NotPaid, Paying, Paid } // TODO name change NotPaid enum PaymentState { Pledged, Paying, Paid } // TODO name change Pledged
/// @dev This struct defines the details of each the PledgeAdmin, these /// @dev This struct defines the details of each the PledgeAdmin, these
/// PledgeAdmins can own pledges and act as delegates /// PledgeAdmins can own pledges and act as delegates
@ -447,7 +447,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
Pledge storage nTo = findPledge(idPledge); Pledge storage nTo = findPledge(idPledge);
@ -475,7 +475,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
PledgeAdmin storage sender = findAdmin(idSender); PledgeAdmin storage sender = findAdmin(idSender);
checkAdminOwner(sender); checkAdminOwner(sender);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
// If the sender is the owner // If the sender is the owner
if (n.owner == idSender) { if (n.owner == idSender) {
@ -553,7 +553,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
PledgeAdmin storage owner = findAdmin(n.owner); PledgeAdmin storage owner = findAdmin(n.owner);
@ -611,7 +611,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid PaymentState.Pledged
); );
oldPledge = normalizePledge(oldPledge); oldPledge = normalizePledge(oldPledge);
@ -709,14 +709,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
idReceiver, idReceiver,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -727,7 +727,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -749,7 +749,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -766,7 +766,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -782,7 +782,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
idReceiver, idReceiver,
uint64(getTime() + maxCommitTime(n)), uint64(getTime() + maxCommitTime(n)),
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -812,7 +812,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
// Check to make sure this pledge hasnt already been used or is in the process of being used // Check to make sure this pledge hasnt already been used or is in the process of being used
if (n.paymentState != PaymentState.NotPaid) return idPledge; if (n.paymentState != PaymentState.Pledged) return idPledge;
// First send to a campaign if it's proposed and commited // First send to a campaign if it's proposed and commited
if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) { if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) {
@ -822,14 +822,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
n.proposedCampaign, n.proposedCampaign,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, n.amount); doTransfer(idPledge, toPledge, n.amount);
idPledge = toPledge; idPledge = toPledge;
n = findPledge(idPledge); n = findPledge(idPledge);

28
build/LiquidPledging_all.sol
View File

@ -52,7 +52,7 @@ contract LiquidPledgingBase {
uint constant MAX_INTERCAMPAIGN_LEVEL = 20; uint constant MAX_INTERCAMPAIGN_LEVEL = 20;
enum PledgeAdminType { Giver, Delegate, Campaign } enum PledgeAdminType { Giver, Delegate, Campaign }
enum PaymentState { NotPaid, Paying, Paid } // TODO name change NotPaid enum PaymentState { Pledged, Paying, Paid } // TODO name change Pledged
/// @dev This struct defines the details of each the PledgeAdmin, these /// @dev This struct defines the details of each the PledgeAdmin, these
/// PledgeAdmins can own pledges and act as delegates /// PledgeAdmins can own pledges and act as delegates
@ -447,7 +447,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
Pledge storage nTo = findPledge(idPledge); Pledge storage nTo = findPledge(idPledge);
@ -475,7 +475,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
PledgeAdmin storage sender = findAdmin(idSender); PledgeAdmin storage sender = findAdmin(idSender);
checkAdminOwner(sender); checkAdminOwner(sender);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
// If the sender is the owner // If the sender is the owner
if (n.owner == idSender) { if (n.owner == idSender) {
@ -553,7 +553,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
PledgeAdmin storage owner = findAdmin(n.owner); PledgeAdmin storage owner = findAdmin(n.owner);
@ -611,7 +611,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid PaymentState.Pledged
); );
oldPledge = normalizePledge(oldPledge); oldPledge = normalizePledge(oldPledge);
@ -709,14 +709,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
idReceiver, idReceiver,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -727,7 +727,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -749,7 +749,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -766,7 +766,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -782,7 +782,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
idReceiver, idReceiver,
uint64(getTime() + maxCommitTime(n)), uint64(getTime() + maxCommitTime(n)),
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -812,7 +812,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
// Check to make sure this pledge hasnt already been used or is in the process of being used // Check to make sure this pledge hasnt already been used or is in the process of being used
if (n.paymentState != PaymentState.NotPaid) return idPledge; if (n.paymentState != PaymentState.Pledged) return idPledge;
// First send to a campaign if it's proposed and commited // First send to a campaign if it's proposed and commited
if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) { if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) {
@ -822,14 +822,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
n.proposedCampaign, n.proposedCampaign,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, n.amount); doTransfer(idPledge, toPledge, n.amount);
idPledge = toPledge; idPledge = toPledge;
n = findPledge(idPledge); n = findPledge(idPledge);

26
contracts/LiquidPledging.sol
View File

@ -44,7 +44,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
Pledge storage nTo = findPledge(idPledge); Pledge storage nTo = findPledge(idPledge);
@ -72,7 +72,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
PledgeAdmin storage sender = findAdmin(idSender); PledgeAdmin storage sender = findAdmin(idSender);
checkAdminOwner(sender); checkAdminOwner(sender);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
// If the sender is the owner // If the sender is the owner
if (n.owner == idSender) { if (n.owner == idSender) {
@ -150,7 +150,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
require(n.paymentState == PaymentState.NotPaid); require(n.paymentState == PaymentState.Pledged);
PledgeAdmin storage owner = findAdmin(n.owner); PledgeAdmin storage owner = findAdmin(n.owner);
@ -208,7 +208,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid PaymentState.Pledged
); );
oldPledge = normalizePledge(oldPledge); oldPledge = normalizePledge(oldPledge);
@ -306,14 +306,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
idReceiver, idReceiver,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -324,7 +324,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
0, 0,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -346,7 +346,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -363,7 +363,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -379,7 +379,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
idReceiver, idReceiver,
uint64(getTime() + maxCommitTime(n)), uint64(getTime() + maxCommitTime(n)),
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, amount); doTransfer(idPledge, toPledge, amount);
} }
@ -409,7 +409,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge); Pledge storage n = findPledge(idPledge);
// Check to make sure this pledge hasnt already been used or is in the process of being used // Check to make sure this pledge hasnt already been used or is in the process of being used
if (n.paymentState != PaymentState.NotPaid) return idPledge; if (n.paymentState != PaymentState.Pledged) return idPledge;
// First send to a campaign if it's proposed and commited // First send to a campaign if it's proposed and commited
if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) { if ((n.proposedCampaign > 0) && ( getTime() > n.commitTime)) {
@ -419,14 +419,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
0, 0,
0, 0,
n.oldPledge, n.oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
uint64 toPledge = findPledge( uint64 toPledge = findPledge(
n.proposedCampaign, n.proposedCampaign,
new uint64[](0), new uint64[](0),
0, 0,
0, 0,
oldPledge, oldPledge,
PaymentState.NotPaid); PaymentState.Pledged);
doTransfer(idPledge, toPledge, n.amount); doTransfer(idPledge, toPledge, n.amount);
idPledge = toPledge; idPledge = toPledge;
n = findPledge(idPledge); n = findPledge(idPledge);

2
contracts/LiquidPledgingBase.sol
View File

@ -16,7 +16,7 @@ contract LiquidPledgingBase {
uint constant MAX_INTERCAMPAIGN_LEVEL = 20; uint constant MAX_INTERCAMPAIGN_LEVEL = 20;
enum PledgeAdminType { Giver, Delegate, Campaign } enum PledgeAdminType { Giver, Delegate, Campaign }
enum PaymentState { NotPaid, Paying, Paid } // TODO name change NotPaid enum PaymentState { Pledged, Paying, Paid } // TODO name change Pledged
/// @dev This struct defines the details of each the PledgeAdmin, these /// @dev This struct defines the details of each the PledgeAdmin, these
/// PledgeAdmins can own pledges and act as delegates /// PledgeAdmins can own pledges and act as delegates

2
js/liquidPledging.js
View File

@ -28,7 +28,7 @@ module.exports = (test) => {
pledge.oldPledge = res.oldPledge; pledge.oldPledge = res.oldPledge;
} }
if (res.paymentState === '0') { if (res.paymentState === '0') {
pledge.paymentState = 'NotPaid'; pledge.paymentState = 'Pledged';
} else if (res.paymentState === '1') { } else if (res.paymentState === '1') {
pledge.paymentState = 'Paying'; pledge.paymentState = 'Paying';
} else if (res.paymentState === '2') { } else if (res.paymentState === '2') {