grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ethcore/parity into rustbeta

Browse Source
This commit is contained in:
debris 2016-02-19 12:40:30 +01:00
commit ecde760b42
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -26,9 +26,8 @@ apt-get install -y --force-yes librocksdb-dev
# install multirust # install multirust
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
# install nightly and make it default # install beta and make it default
multirust update nightly multirust default beta
multirust default nightly
# download and build parity # download and build parity
git clone https://github.com/ethcore/parity git clone https://github.com/ethcore/parity
@ -47,12 +46,11 @@ sudo cp -a librocksdb.so* /usr/lib
sudo ldconfig sudo ldconfig
cd .. cd ..
# install rust nightly # install rust beta
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes
# install nightly and make it default # install beta and make it default
sudo multirust update nightly sudo multirust default beta
sudo multirust default nightly
# download and build parity # download and build parity
git clone https://github.com/ethcore/parity git clone https://github.com/ethcore/parity
@ -68,8 +66,8 @@ brew update
brew install rocksdb brew install rocksdb
brew install multirust brew install multirust
# install nightly and make it default # install beta and make it default
multirust update nightly && multirust default nightly multirust default beta
# download and build parity # download and build parity
git clone https://github.com/ethcore/parity git clone https://github.com/ethcore/parity

3
ethcore/src/service.rs
View File

@ -124,6 +124,8 @@ impl IoHandler<NetSyncMessage> for ClientIoHandler {
} }
} }
// TODO: rewrite into something that doesn't dependent on the testing environment having a particular port ready for use.
/*
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -138,3 +140,4 @@ mod tests {
assert!(service.is_ok()); assert!(service.is_ok());
} }
} }
*/

28
install-deps.sh
View File

@ -346,8 +346,7 @@ function run_installer()
exe brew install rocksdb exe brew install rocksdb
info "Installing multirust" info "Installing multirust"
exe brew install multirust exe brew install multirust
sudo multirust update nightly sudo multirust default beta
sudo multirust default nightly
echo echo
} }
@ -426,20 +425,20 @@ function run_installer()
depFound=$((depFound+1)) depFound=$((depFound+1))
check "multirust" check "multirust"
isMultirust=true isMultirust=true
if [[ $(multirust show-default 2>/dev/null | grep nightly | wc -l) == 4 ]]; then if [[ $(multirust show-default 2>/dev/null | grep beta | wc -l) == 4 ]]; then
depFound=$((depFound+1)) depFound=$((depFound+1))
check "rust nightly" check "rust beta"
isMultirustNightly=true isMultirustBeta=true
else else
uncheck "rust is not nightly" uncheck "rust is not beta"
isMultirustNightly=false isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust -> rust nightly:${reset}${n}" INSTALL_FILES+="${blue}${dim}==> multirust -> rust beta:${reset}${n}"
fi fi
else else
uncheck "multirust is missing" uncheck "multirust is missing"
uncheck "rust nightly is missing" uncheck "rust beta is missing"
isMultirust=false isMultirust=false
isMultirustNightly=false isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust:${reset}${n}" INSTALL_FILES+="${blue}${dim}==> multirust:${reset}${n}"
fi fi
} }
@ -626,10 +625,9 @@ function run_installer()
echo echo
fi fi
if [[ $isMultirustNightly == false ]]; then if [[ $isMultirustBeta == false ]]; then
info "Installing rust nightly..." info "Installing rust beta..."
multirust update nightly multirust default beta
multirust default nightly
echo echo
fi fi
} }
@ -660,7 +658,7 @@ function run_installer()
find_rocksdb find_rocksdb
find_multirust find_multirust
if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustNightly == false ]]; then if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustBeta == false ]]; then
abort_install abort_install
fi fi
fi fi

2
rpc/Cargo.toml
View File

@ -22,7 +22,7 @@ rustc-serialize = "0.3"
serde_macros = { version = "0.6.13", optional = true } serde_macros = { version = "0.6.13", optional = true }
[build-dependencies] [build-dependencies]
serde_codegen = { "version" = "0.6.13", "optional" = true } serde_codegen = { version = "0.6.13", optional = true }
syntex = "0.29.0" syntex = "0.29.0"
[features] [features]