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

Merge pull request #712 from ethcore/beta-version

Browse Source 
Version 1.0 in beta
This commit is contained in:
Arkadiy Paronyan
2016-03-14 14:56:44 +01:00
parent 75a11ba9be 4ac9807bc1
commit 0087568c16
13 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/src/bytes.rs
View File

@@ -177,7 +177,7 @@ impl<T> BytesConvertable for T where T: AsRef<[u8]> {
#[test]
fn bytes_convertable() {
assert_eq!(vec![0x12u8, 0x34].bytes(), &[0x12u8, 0x34]);
assert_eq!([0u8; 0].bytes(), &[]);
assert!([0u8; 0].bytes().is_empty());
}
/// Simple trait to allow for raw population of a Sized object from a byte slice.

4
util/src/misc.rs
View File

@@ -70,7 +70,7 @@ pub fn contents(name: &str) -> Result<Bytes, UtilError> {
/// Get the standard version string for this software.
pub fn version() -> String {
format!("Parity/v{}-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
format!("Parity/v{}-beta-{}-{}/{}-{}-{}/rustc{}", env!("CARGO_PKG_VERSION"), short_sha(), commit_date().replace("-", ""), Target::arch(), Target::os(), Target::env(), rustc_version::version())
}
/// Get the standard version data for this software.
@@ -85,4 +85,4 @@ pub fn version_data() -> Bytes {
s.append(&format!("{}", rustc_version::version()));
s.append(&&Target::os()[0..2]);
s.out()
}
}