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

find to findOrCreate name refactor

This commit is contained in:
Jordi Baylina 2017-10-04 12:55:46 +02:00
parent b4d5e5657c
commit 2af64a9e60
No known key found for this signature in database
GPG Key ID: 7480C80C1BE43112
11 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ILiquidPledgingPlugin.sol.js
View File

@ -1,6 +1,6 @@
/* This is an autogenerated file. DO NOT EDIT MANUALLY */
exports.ILiquidPledgingPluginAbi = [{"constant":false,"inputs":[{"name":"noteManager","type":"uint64"},{"name":"noteFrom","type":"uint64"},{"name":"noteTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"afterTransfer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"noteManager","type":"uint64"},{"name":"noteFrom","type":"uint64"},{"name":"noteTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"beforeTransfer","outputs":[{"name":"maxAllowed","type":"uint256"}],"payable":false,"type":"function"}]
exports.ILiquidPledgingPluginAbi = [{"constant":false,"inputs":[{"name":"pledgeManager","type":"uint64"},{"name":"pledgeFrom","type":"uint64"},{"name":"pledgeTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"afterTransfer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"pledgeManager","type":"uint64"},{"name":"pledgeFrom","type":"uint64"},{"name":"pledgeTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"beforeTransfer","outputs":[{"name":"maxAllowed","type":"uint256"}],"payable":false,"type":"function"}]
exports.ILiquidPledgingPluginByteCode = "0x"
exports._solcVersion = "0.4.15+commit.bbb8e64f.Emscripten.clang"
exports._sha256 = "0xef8854fe0982df3dec97b6aec02e2d850ad86c960ca5b3545346b7ca4c5e8c48"
exports._sha256 = "0x459746b8fd9702f2cc9d65c3f59f37610e76e6ec5739d5bd5ba1c694dba94edd"

12
build/ILiquidPledgingPlugin_all.sol
View File

@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
/// ...
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
function beforeTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount
) returns (uint maxAllowed);
function afterTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount);
}

8
build/LiquidPledging.sol.js
View File

File diff suppressed because one or more lines are too long

6
build/LiquidPledgingBase.sol.js
View File

File diff suppressed because one or more lines are too long

14
build/LiquidPledgingBase_all.sol
View File

@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
/// ...
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
function beforeTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount
) returns (uint maxAllowed);
function afterTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount);
}
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
/// created in this system yet then it wouldn't be in the hash array
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
/// created already...
function findPledge(
function findOrCreatePledge(
uint64 owner,
uint64[] delegationChain,
uint64 intendedCampaign,

10
build/LiquidPledgingMock.sol.js
View File

File diff suppressed because one or more lines are too long

38
build/LiquidPledgingMock_all.sol
View File

@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
/// ...
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
function beforeTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount
) returns (uint maxAllowed);
function afterTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount);
}
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
/// created in this system yet then it wouldn't be in the hash array
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
/// created already...
function findPledge(
function findOrCreatePledge(
uint64 owner,
uint64[] delegationChain,
uint64 intendedCampaign,
@ -453,7 +453,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(amount > 0);
vault.transfer(amount); // transfers the baseToken to the Vault
uint64 idPledge = findPledge(
uint64 idPledge = findOrCreatePledge(
idGiver,
new uint64[](0), //what is new?
0,
@ -571,7 +571,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
checkAdminOwner(owner);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -596,7 +596,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Check the campaign is not canceled in the while.
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -617,7 +617,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(n.paymentState == PaymentState.Paying); //TODO change to revert
// When a payment is canceled, never is assigned to a campaign.
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -715,14 +715,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge);
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -733,7 +733,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
}
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -755,7 +755,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Make the last item in the array the idReceiver
newDelegationChain[n.delegationChain.length] = idReceiver;
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -772,7 +772,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
for (uint i=0; i<n.delegationChain.length - q; i++) {
newDelegationChain[i] = n.delegationChain[i];
}
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -788,7 +788,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
idReceiver,
@ -828,14 +828,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// First send to a campaign if it's proposed and commited
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.intendedCampaign,
new uint64[](0),
0,

38
build/LiquidPledging_all.sol
View File

@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
/// ...
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
function beforeTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount
) returns (uint maxAllowed);
function afterTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount);
}
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
/// created in this system yet then it wouldn't be in the hash array
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
/// created already...
function findPledge(
function findOrCreatePledge(
uint64 owner,
uint64[] delegationChain,
uint64 intendedCampaign,
@ -453,7 +453,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(amount > 0);
vault.transfer(amount); // transfers the baseToken to the Vault
uint64 idPledge = findPledge(
uint64 idPledge = findOrCreatePledge(
idGiver,
new uint64[](0), //what is new?
0,
@ -571,7 +571,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
checkAdminOwner(owner);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -596,7 +596,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Check the campaign is not canceled in the while.
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -617,7 +617,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(n.paymentState == PaymentState.Paying); //TODO change to revert
// When a payment is canceled, never is assigned to a campaign.
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -715,14 +715,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge);
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -733,7 +733,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
}
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -755,7 +755,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Make the last item in the array the idReceiver
newDelegationChain[n.delegationChain.length] = idReceiver;
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -772,7 +772,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
for (uint i=0; i<n.delegationChain.length - q; i++) {
newDelegationChain[i] = n.delegationChain[i];
}
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -788,7 +788,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
idReceiver,
@ -828,14 +828,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// First send to a campaign if it's proposed and commited
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.intendedCampaign,
new uint64[](0),
0,

12
contracts/ILiquidPledgingPlugin.sol
View File

@ -17,16 +17,16 @@ contract ILiquidPledgingPlugin {
/// ...
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
function beforeTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount
) returns (uint maxAllowed);
function afterTransfer(
uint64 noteManager,
uint64 noteFrom,
uint64 noteTo,
uint64 pledgeManager,
uint64 pledgeFrom,
uint64 pledgeTo,
uint64 context,
uint amount);
}

24
contracts/LiquidPledging.sol
View File

@ -38,7 +38,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(amount > 0);
vault.transfer(amount); // transfers the baseToken to the Vault
uint64 idPledge = findPledge(
uint64 idPledge = findOrCreatePledge(
idGiver,
new uint64[](0), //what is new?
0,
@ -156,7 +156,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
checkAdminOwner(owner);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -181,7 +181,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Check the campaign is not canceled in the while.
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
uint64 idNewPledge = findPledge(
uint64 idNewPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -202,7 +202,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(n.paymentState == PaymentState.Paying); //TODO change to revert
// When a payment is canceled, never is assigned to a campaign.
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
@ -300,14 +300,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
Pledge storage n = findPledge(idPledge);
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -318,7 +318,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
}
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
idReceiver,
new uint64[](0),
0,
@ -340,7 +340,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// Make the last item in the array the idReceiver
newDelegationChain[n.delegationChain.length] = idReceiver;
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -357,7 +357,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
for (uint i=0; i<n.delegationChain.length - q; i++) {
newDelegationChain[i] = n.delegationChain[i];
}
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
newDelegationChain,
0,
@ -373,7 +373,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
idReceiver,
@ -413,14 +413,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
// First send to a campaign if it's proposed and commited
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
uint64 oldPledge = findPledge(
uint64 oldPledge = findOrCreatePledge(
n.owner,
n.delegationChain,
0,
0,
n.oldPledge,
PaymentState.Pledged);
uint64 toPledge = findPledge(
uint64 toPledge = findOrCreatePledge(
n.intendedCampaign,
new uint64[](0),
0,

2
contracts/LiquidPledgingBase.sol
View File

@ -278,7 +278,7 @@ contract LiquidPledgingBase {
/// created in this system yet then it wouldn't be in the hash array
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
/// created already...
function findPledge(
function findOrCreatePledge(
uint64 owner,
uint64[] delegationChain,
uint64 intendedCampaign,