Merge pull request #19 from barlock/helpers

Upgrade to newest standards set!

Author: BreakPointer

.prettierignore

@@ -1,5 +1,6 @@
 **/coverage/
 **/build/
+**/.0x-artifacts/
 **/node_modules/
 
 **/coverage.json

.solhint.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["solhint:recommended", "web3studio"]
+}

.soliumignore .solhintignore.soliumignore renamed to .solhintignore

@@ -4,23 +4,22 @@
   "scripts": {
     "test": "yarn lint && yarn test:packages",
     "test:packages": "lerna run test --concurrency 1 --stream",
-    "lint": "yarn eslint . && yarn solium -d .",
-    "prettier": "prettier \"**/*.{js,json,css,md}\" --write"
+    "lint": "yarn lint:js && yarn lint:sol",
+    "lint:js": "eslint .",
+    "lint:sol": "solhint \"**/*.sol\" -f stylish",
+    "prettier": "prettier \"**/*.{js,json,css,md,sol,yml}\" --write"
   },
   "devDependencies": {
-    "@0x/sol-coverage": "^3.0.4",
-    "@0x/sol-trace": "^2.0.4",
     "dotenv": "^6.2.0",
     "eslint": "^5.16.0",
-    "eslint-config-web3studio": "^1.2.0",
+    "eslint-config-web3studio": "^3.0.0",
     "husky": "^2.2.0",
-    "jest-matchers": "^20.0.3",
     "lerna": "^3.5.0",
     "prettier": "^1.17.0",
     "pretty-quick": "^1.10.0",
-    "solium": "^1.2.4",
-    "solium-config-web3studio": "^1.2.0",
-    "truffle": "^5.0.17"
+    "solhint": "^2.1.0",
+    "solhint-config-web3studio": "^3.0.0",
+    "web3studio-helpers": "^3.0.0"
   },
   "workspaces": {
     "packages": [

.soliumrc.json

@@ -0,0 +1,6 @@
+check:
+  global:
+    statements: 100
+    branches: 100
+    functions: 100
+    lines: 100

package.json

@@ -1,7 +1,6 @@
-pragma solidity ^0.5.0;
+pragma solidity 0.5.8;
 
 contract MessageReceiver {
-
   // Each receiver manages messages for only one topic
   string public topicName;
   // Message key to message mapping for look-up
@@ -22,7 +21,7 @@ contract MessageReceiver {
   *
   * @param topic string The topic name for the messages
   */
-  constructor (string memory topic) public {
+  constructor(string memory topic) public {
     topicName = topic;
   }
 
@@ -37,24 +36,28 @@ contract MessageReceiver {
     messages[key].sender = msg.sender;
     messages[key].message = newMessage;
 
-    emit MessageReceived(topicName, msg.sender, key); 
+    emit MessageReceived(topicName, msg.sender, key);
   }
 
   /**
   * @notice Gets the count of the messages sent to this topic
-  * 
+  *
   * @return uint256 Count of messages
   */
-  function getMessageCount() public view returns(uint256) {
+  function getMessageCount() public view returns (uint256) {
     return messageList.length;
   }
 
   /**
   * @notice Gets a message given a key
   *
-  * @return address, string Returns the sender address and message contents 
+  * @return address, string Returns the sender address and message contents
   */
-  function getMessage(bytes32 key) public view returns (address, string memory) {
+  function getMessage(bytes32 key)
+    public
+    view
+    returns (address, string memory)
+  {
     return (messages[key].sender, messages[key].message);
   }
-}
+}

packages/message-bus/.istanbul.yml

@@ -1,4 +1,4 @@
-pragma solidity >=0.4.21 <0.6.0;
+pragma solidity 0.5.8;
 
 contract Migrations {
   address public owner;