Skip to content

Check #2

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

Closed
thekaleidoscope wants to merge 2 commits into from
Closed

Check #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc3f34
Optimize and revise
thekaleidoscope Nov 13, 2017
5ad9f9c
Revise and Optimize-2
thekaleidoscope Nov 13, 2017
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
8 changes: 0 additions & 8 deletions contracts/ConvertLib.sol
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions contracts/MetaCoin.sol
View file
Open in desktop

This file was deleted.

30 changes: 13 additions & 17 deletions contracts/driver1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.0;
pragma solidity ^0.4.6;

contract driver {

Expand Down Expand Up @@ -72,24 +72,20 @@ contract driver {

if(count==1)
{
var1=msg.sender;
link[_req_member]=member(now,count,_req_member,var1,0,0,0);
link[_req_member]=member(now,count,_req_member,msg.sender,0,0,0);
}
else if (count==2)
{
var2=msg.sender;
link[_req_member]=member(now,count,_req_member,var1,var2,0,0);
link[_req_member].ref_2=msg.sender;
}
else if (count==3)
{
var3=msg.sender;
link[_req_member]=member(now,count,_req_member,var1,var2,var3,0);
link[_req_member].ref_3=msg.sender;
}

else if (count==4)
{
var4=msg.sender;
link[_req_member]=member(now,count,_req_member,var1,var2,var3,var4);
link[_req_member].ref_4=msg.sender;
}

count++;
Expand All @@ -110,7 +106,9 @@ contract driver {

}

function pool(uint __amount) payable {
//No constantto force user to deposit_to_pool for 6 months

function deposit_to_pool(uint __amount) payable {

this.transfer(__amount);
SomeoneAddedMoneyToThePool(msg.sender,__amount);
Expand Down Expand Up @@ -186,7 +184,7 @@ contract driver {

uint counter_sum=1;

function assign_loan_amount_from_pool() constant returns (uint){
function assign_loan_amount_from_pool() returns (uint){

sum = 0;

Expand All @@ -209,7 +207,7 @@ contract driver {
return(link[ad1].addtime);
}

function displayAllowedForLoan() constant returns(address[]){
function displayAllowedForLoan() payable returns(address[]){

uint length = amounts.length;
address[] memory addr = new address[](length);
Expand All @@ -227,7 +225,7 @@ contract driver {

modifier least_amount_loan() {

if(sum < (this.balance)/4){
if(sum <= (this.balance)/4){
throw;
}
else{
Expand All @@ -236,7 +234,7 @@ contract driver {

}

function pay_loan() least_amount_loan() {
function pay_loan() payable least_amount_loan() {

for(uint w=0; w < counter_sum; w++ ){

Expand All @@ -248,9 +246,7 @@ contract driver {

function getcurrtime() constant returns(uint)
{

currtime=now;
return currtime;
return now;
}

function () payable{
Expand Down
7 changes: 2 additions & 5 deletions migrations/2_deploy_contracts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
var ConvertLib = artifacts.require("./ConvertLib.sol");
var MetaCoin = artifacts.require("./MetaCoin.sol");
var driver1= artifacts.require("./driver1.sol");

module.exports = function(deployer) {
deployer.deploy(ConvertLib);
deployer.link(ConvertLib, MetaCoin);
deployer.deploy(MetaCoin);
deployer.deploy(driver1);
};