Merge pull request #159 from paritytech/snd-refactor

refactor&more (feel free to review, still improving docs and tests)

Author: debris

.travis.yml

@@ -5,7 +5,10 @@ branches:
 matrix:
   include:
     - language: rust
-      rust: stable
+      # using `rust: stable` below would be preferable but it randomly
+      # breaks the rustfmt check on travis (`cargo fmt --all -- --write-mode=diff`)
+      # sometimes when the rustfmt rules have changed
+      rust: stable-2018-06-21
       sudo: required
       dist: trusty
       cache: cargo
@@ -18,6 +21,8 @@ matrix:
       before_script:
         - export PATH=/snap/bin:${PATH}
         - rustup component add rustfmt-preview
+        # useful for troubleshooting
+        - rustfmt --version
       script:
         # using --write-mode=diff instructs rustfmt to exit with an error code if the input is not formatted correctly
         - cargo fmt --all -- --write-mode=diff

Cargo.lock

@@ -1,2 +1,2 @@
 [workspace]
-members = ["tests", "cli", "bridge", "integration-tests", "deploy"]
+members = ["cli", "bridge", "integration-tests", "deploy", "contracts"]

Cargo.toml

@@ -4,23 +4,27 @@ version = "0.4.0"
 authors = ["debris <[email protected]>", "snd <[email protected]>"]
 
 [dependencies]
+bridge-contracts = { path = "../contracts" }
 futures = "0.1"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tokio-core = "0.1.8"
 tokio-timer = "0.1.2"
 toml = "0.4.2"
-web3 = { git = "https://github.com/tomusdrw/rust-web3", branch = "bridge" }
-error-chain = "0.11.0-rc.2"
-ethabi = "5.1"
-ethabi-derive = "5.0"
-ethabi-contract = "5.0"
+web3 = { git = "https://github.com/tomusdrw/rust-web3" }
+error-chain = "0.11.0"
+ethabi = { git = "https://github.com/paritytech/ethabi" }
 rustc-hex = "1.0"
 log = "0.3"
-ethereum-types = "0.2"
+ethereum-types = "0.3"
 pretty_assertions = "0.2.1"
+tiny-keccak = "1.3"
 
 [dev-dependencies]
 tempdir = "0.3"
 quickcheck = "0.6.1"
+jsonrpc-core = "8.0"
+
+[build-dependencies]
+solc = { git = "https://github.com/paritytech/rust_solc" }

bridge/Cargo.toml

@@ -1,3 +1,20 @@
+// Copyright 2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity-Bridge.
+
+// Parity-Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity-Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity-Bridge.  If not, see <http://www.gnu.org/licenses/>.
+extern crate solc;
+
 use std::process::Command;
 
 fn main() {
@@ -11,43 +28,19 @@ fn main() {
     let output = Command::new("git")
         .args(&["rev-parse", "HEAD"])
         .output()
-        .unwrap();
+        .expect("`git rev-parse HEAD` failed to run. run it yourself to verify. file an issue if this persists");
     let git_hash = String::from_utf8(output.stdout).unwrap();
     println!("cargo:rustc-env=GIT_HASH={}", git_hash);
 
     // make solc version used to compile contracts (`solc --version`)
     // available via `env!("SOLC_VERSION")` in sources
-    let output = Command::new("solc").args(&["--version"]).output().unwrap();
+    let output = Command::new("solc").args(&["--version"]).output().expect(
+        "`solc --version` failed to run. run it yourself to verify. file an issue if this persists",
+    );
     let output_string = String::from_utf8(output.stdout).unwrap();
     let solc_version = output_string.lines().last().unwrap();
     println!("cargo:rustc-env=SOLC_VERSION={}", solc_version);
 
     // compile contracts for inclusion with ethabis `use_contract!`
-    match Command::new("solc")
-        .arg("--abi")
-        .arg("--bin")
-        .arg("--optimize")
-        .arg("--output-dir")
-        .arg("../compiled_contracts")
-        .arg("--overwrite")
-        .arg("../contracts/bridge.sol")
-        .status()
-    {
-        Ok(exit_status) => {
-            if !exit_status.success() {
-                if let Some(code) = exit_status.code() {
-                    panic!("`solc` exited with error exit status code `{}`", code);
-                } else {
-                    panic!("`solc` exited because it was terminated by a signal");
-                }
-            }
-        }
-        Err(err) => {
-            if let std::io::ErrorKind::NotFound = err.kind() {
-                panic!("`solc` executable not found in `$PATH`. `solc` is required to compile the bridge contracts. please install it: https://solidity.readthedocs.io/en/develop/installing-solidity.html");
-            } else {
-                panic!("an error occurred when trying to spawn `solc`: {}", err);
-            }
-        }
-    }
+    solc::compile_dir("../contracts", "../compiled_contracts").unwrap();
 }