Skip to content

Commit dc92ac3

Browse files
author
Andronik Ordian
committed
Merge branch 'master' into ao-type-metadata
* master: (56 commits) primitive-types: add no_std support for serde feature (#385) Add Rocksdb Secondary Instance Api (#384) kvdb-rocksdb: update rocksdb to 0.14 (#379) prepare releases for a few crates (#382) uint: fix UB in uint::from_big_endian (#381) Fix limit prefix delete case (#368) Add arbitrary trait implementation (#378) kvdb-rocksdb: optimize and rename iter_from_prefix (#365) bump parity-util-mem (#376) parity-util-mem: fix for windows (#375) keccak-hash: fix bench and add one for range (#372) [parity-crypto] Release 0.6.1 (#373) keccak-hash: bump version to 0.5.1 (#371) keccak-hash: add keccak256_range and keccak512_range functions (#370) Allow pubkey recovery for all-zero messages (#369) Delete by prefix operator in kvdb (#360) kvdb: no overlay (#313) Ban duplicates of parity-uil-mem from being linked into the same program (#363) Use correct license ID (#362) Memtest example for Rocksdb (#349) ...
2 parents fea273c + 371f17f commit dc92ac3

File tree

169 files changed

+3132
-2598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+3132
-2598
lines changed

.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@ matrix:
88
rust: stable
99
before_script:
1010
- rustup component add rustfmt
11-
- os: linux
12-
rust: beta
1311
- os: linux
1412
rust: nightly
1513
script:
16-
- cargo check --all --benches
14+
- cargo check --workspace --benches
15+
- os: linux
16+
rust: stable
17+
install:
18+
- cargo install cross
19+
script:
20+
- cross test --target=aarch64-linux-android -p parity-util-mem
1721
- os: osx
18-
osx_image: xcode11.2
22+
osx_image: xcode11.3
1923
addons:
2024
chrome: stable
2125
firefox: latest
2226
install:
23-
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | sh
27+
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | sh
2428
- source ~/.nvm/nvm.sh
2529
- nvm install --lts
2630
- npm install -g chromedriver
@@ -32,12 +36,11 @@ matrix:
3236
install:
3337
- curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
3438
script:
35-
- if [ "$TRAVIS_RUST_VERSION" == "stable" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
39+
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
3640
cargo fmt -- --check;
3741
fi
38-
- cargo check --all --tests
39-
- cargo build --all
40-
- cargo test --all --exclude uint --exclude fixed-hash
42+
- cargo check --workspace --tests --benches
43+
- cargo test --workspace --exclude uint --exclude fixed-hash --exclude parity-crypto
4144
- if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then
4245
cd contract-address/ && cargo test --features=external_doc && cd ..;
4346
fi
@@ -48,11 +51,14 @@ script:
4851
- cd keccak-hash/ && cargo test --no-default-features && cd ..
4952
- cd plain_hasher/ && cargo test --no-default-features && cargo check --benches && cd ..
5053
- cd parity-bytes/ && cargo test --no-default-features && cd ..
54+
- cd parity-crypto/ && cargo test --all-features && cd ..
5155
- cd parity-util-mem/ && cargo test --features=estimate-heapsize && cd ..
5256
- cd parity-util-mem/ && cargo test --features=jemalloc-global && cd ..
5357
- cd parity-util-mem/ && cargo test --features=mimalloc-global && cd ..
5458
- cd parity-util-mem/ && cargo test --no-default-features --features=dlmalloc-global && cd ..
59+
- cd primitive-types/ && cargo test --all-features && cd ..
60+
- cd primitive-types/ && cargo test --no-default-features --features=serde_no_std && cd ..
5561
- cd rlp/ && cargo test --no-default-features && cargo check --benches && cd ..
5662
- cd triehash/ && cargo check --benches && cd ..
57-
- cd kvdb-web/ && wasm-pack test --headless --chrome --firefox && cd ..
63+
- cd kvdb-web/ && wasm-pack test --headless --firefox && cd ..
5864

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ members = [
1313
"parity-path",
1414
"plain_hasher",
1515
"rlp",
16+
"rlp-derive",
17+
"runtime",
1618
"transaction-pool",
1719
"trace-time",
1820
"triehash",

LICENSE

Lines changed: 0 additions & 674 deletions
This file was deleted.
File renamed without changes.

rlp/LICENSE-MIT renamed to LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2017 Parity Technologies
1+
Copyright (c) 2015-2020 Parity Technologies
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[travis-image]: https://travis-ci.org/paritytech/parity-common.svg?branch=master
55
[travis-url]: https://travis-ci.org/paritytech/parity-common
6-
[appveyor-image]: https://ci.appveyor.com/api/projects/status/github/paritytech/parity-common/branch/master?svg=true
6+
[appveyor-image]: https://ci.appveyor.com/api/projects/status/github/paritytech/parity-common?branch=master&svg=true
77
[appveyor-url]: https://ci.appveyor.com/project/paritytech/parity-common/branch/master
88

99
# parity-common

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ test_script:
2626
- cd fixed-hash/ && cargo test --all-features && cd ..
2727
- cd uint/ && cargo test --features=std,quickcheck --release && cd ..
2828
- cd plain_hasher/ && cargo test --no-default-features && cd ..
29+
- cd parity-util-mem/ && cargo test --no-default-features && cd ..
2930
- cd parity-util-mem/ && cargo test --features=estimate-heapsize && cd ..
31+
- cd parity-util-mem/ && cargo test && cd ..

contract-address/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@ The format is based on [Keep a Changelog].
55
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
66

77
## [Unreleased]
8+
9+
## [0.9.0] - 2020-03-16
10+
- License changed from MIT to dual MIT/Apache2. [#342](https://github.com/paritytech/parity-common/pull/342)
11+
- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)

contract-address/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "contract-address"
3-
version = "0.3.0"
3+
version = "0.4.0"
44
authors = ["Parity Technologies <[email protected]>"]
5-
license = "MIT"
5+
license = "MIT OR Apache-2.0"
66
homepage = "https://github.com/paritytech/parity-common"
77
repository = "https://github.com/paritytech/parity-common"
88
description = "A utility crate to create an ethereum contract address"
@@ -11,9 +11,9 @@ edition = "2018"
1111
readme = "README.md"
1212

1313
[dependencies]
14-
ethereum-types = { version = "0.8.0", path = "../ethereum-types" }
14+
ethereum-types = { version = "0.9.0", path = "../ethereum-types" }
1515
rlp = { version = "0.4", path = "../rlp" }
16-
keccak-hash = { version = "0.4", path = "../keccak-hash", default-features = false }
16+
keccak-hash = { version = "0.5", path = "../keccak-hash", default-features = false }
1717

1818
[features]
1919
default = []

contract-address/src/lib.rs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
// Copyright 2019 Parity Technologies (UK) Ltd.
2-
// This file is part of Parity Ethereum.
3-
4-
// Parity Ethereum is free software: you can redistribute it and/or modify
5-
// it under the terms of the GNU General Public License as published by
6-
// the Free Software Foundation, either version 3 of the License, or
7-
// (at your option) any later version.
8-
9-
// Parity Ethereum is distributed in the hope that it will be useful,
10-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
// GNU General Public License for more details.
13-
14-
// You should have received a copy of the GNU General Public License
15-
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
1+
// Copyright 2020 Parity Technologies
2+
//
3+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
4+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
5+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
6+
// option. This file may not be copied, modified, or distributed
7+
// except according to those terms.
168

179
#![cfg_attr(feature = "external_doc", feature(external_doc))]
1810
#![cfg_attr(feature = "external_doc", doc(include = "../README.md"))]

0 commit comments

Comments
 (0)