Skip to content

Commit

Permalink
ADD npm run remixd + mochfolder
Browse files Browse the repository at this point in the history
  • Loading branch information
serapath committed Dec 13, 2017
1 parent 04aab0c commit 9366074
Show file tree
Hide file tree
Showing 11 changed files with 149 additions and 5 deletions.
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
"csjs-inject": "^1.0.1",
"csslint": "^1.0.2",
"deep-equal": "^1.0.1",
"npm-link-local": "^1.1.0",
"remix-core": "latest",
"remix-lib": "latest",
"remix-solidity": "latest",
"remix-debugger": "latest",
"ethereumjs-abi": "https://github.com/ethereumjs/ethereumjs-abi",
"ethereumjs-block": "^1.6.0",
"ethereumjs-tx": "^1.3.3",
Expand All @@ -42,8 +37,14 @@
"mkdirp": "^0.5.1",
"nightwatch": "^0.9.3",
"notify-error": "^1.2.0",
"npm-link-local": "^1.1.0",
"npm-run-all": "^4.0.2",
"onchange": "^3.2.1",
"remix-core": "latest",
"remix-debugger": "latest",
"remix-lib": "latest",
"remix-solidity": "latest",
"remixd": "^0.1.2",
"rimraf": "^2.6.1",
"selenium-standalone": "^6.0.1",
"solc": "https://github.com/ethereum/solc-js",
Expand Down Expand Up @@ -154,6 +155,7 @@
"nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
"onchange": "onchange build/app.js -- npm-run-all lint",
"prepublish": "mkdirp build; npm-run-all -ls downloadsolc build",
"remixd": "remixd -S ./test-browser/mockfilesandfolder",
"selenium": "execr --silent selenium-standalone start",
"selenium-install": "selenium-standalone install",
"serve": "execr --silent http-server .",
Expand Down
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/app/ethereum/constitution.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract Constitution {

function Found(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/app/solidity/mode.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract Mode {

function Normal(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
65 changes: 65 additions & 0 deletions test-browser/mockfilesandfolder/ballot.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
pragma solidity ^0.4.0;
contract Ballot {

struct Voter {
uint weight;
bool voted;
uint8 vote;
address delegate;
}
struct Proposal {
uint voteCount;
}

address chairperson;
mapping(address => Voter) voters;
Proposal[] proposals;

/// Create a new ballot with $(_numProposals) different proposals.
function Ballot(uint8 _numProposals) {
chairperson = msg.sender;
voters[chairperson].weight = 1;
proposals.length = _numProposals;
}

/// Give $(voter) the right to vote on this ballot.
/// May only be called by $(chairperson).
function giveRightToVote(address voter) {
if (msg.sender != chairperson || voters[voter].voted) return;
voters[voter].weight = 1;
}

/// Delegate your vote to the voter $(to).
function delegate(address to) {
Voter sender = voters[msg.sender]; // assigns reference
if (sender.voted) return;
while (voters[to].delegate != address(0) && voters[to].delegate != msg.sender)
to = voters[to].delegate;
if (to == msg.sender) return;
sender.voted = true;
sender.delegate = to;
Voter delegate = voters[to];
if (delegate.voted)
proposals[delegate.vote].voteCount += sender.weight;
else
delegate.weight += sender.weight;
}

/// Give a single vote to proposal $(proposal).
function vote(uint8 proposal) {
Voter sender = voters[msg.sender];
if (sender.voted || proposal >= proposals.length) return;
sender.voted = true;
sender.vote = proposal;
proposals[proposal].voteCount += sender.weight;
}

function winningProposal() constant returns (uint8 winningProposal) {
uint256 winningVoteCount = 0;
for (uint8 proposal = 0; proposal < proposals.length; proposal++)
if (proposals[proposal].voteCount > winningVoteCount) {
winningVoteCount = proposals[proposal].voteCount;
winningProposal = proposal;
}
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/src/gmbh/company.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract Assets {

function add(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/src/gmbh/contract.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract gmbh {

function register(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/src/gmbh/test.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract test {

function Test(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
14 changes: 14 additions & 0 deletions test-browser/mockfilesandfolder/src/leasing.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
contract lease {

function Vote(uint8 _numProposals) {
proposals.length = _numProposals;
}
}


contract borrow {

function Vote(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/src/ug/finance.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract Finance {

function Loan(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
6 changes: 6 additions & 0 deletions test-browser/mockfilesandfolder/src/voting.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contract voting {

function Vote(uint8 _numProposals) {
proposals.length = _numProposals;
}
}
21 changes: 21 additions & 0 deletions test-browser/mockfilesandfolder/test/client/credit.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
contract credit_1 {

struct Proposal {
uint voteCount;
}

function Ballot(uint8 _numProposals) {
proposals.length = _numProposals;
}
}

contract credit_2 {

struct Proposal {
uint voteCount;
}

function Ballot(uint8 _numProposals) {
proposals.length = _numProposals;
}
}

0 comments on commit 9366074

Please sign in to comment.