Skip to content

Commit

Permalink
Small Fixes
Browse files Browse the repository at this point in the history
Changed:
1. OpenZeppelin from 1.9.0 to 1.10.0 (removes warnings)
2. Modified Migrations.sol to use new constructor format
3. Changed keccak256 to explicitly cast to bytes
4. Modified README to start ganache with 7mm gas limit
  • Loading branch information
adamdossa committed Jun 19, 2018
1 parent dd2aa48 commit 1d0a4e1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This will display some warnings due to OpenZeppelin library files which can be i
## Running Test Network

To run a test ethereum network, in a separate terminal execute:
`ganache-cli`
`ganache-cli --gasLimit 7000000`

## Deployment

Expand Down
2 changes: 1 addition & 1 deletion contracts/ArbitrationFactory.sol
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ contract ArbitrationFactory is Ownable {
* @notice Returns the hash of an agreement string
*/
function generateHash(string _input) pure public returns (bytes32) {
return keccak256(_input);
return keccak256(bytes(_input));
}

}
2 changes: 1 addition & 1 deletion contracts/Migrations.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ contract Migrations {
if (msg.sender == owner) _;
}

function Migrations() public {
constructor() public {
owner = msg.sender;
}

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"homepage": "https://github.com/jurteam/mvp-smart-contract#readme",
"dependencies": {
"ganache-cli": "^6.1.3",
"openzeppelin-solidity": "^1.9.0",
"openzeppelin-solidity": "^1.10.0",
"truffle": "^4.1.11"
},
"devDependencies": {
Expand Down

0 comments on commit 1d0a4e1

Please sign in to comment.