Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows block validation tests fix #2023

Closed
wants to merge 1 commit into from
Closed

Windows block validation tests fix #2023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

defaults:
rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2020-06-10
rust_image: &rust_image quay.io/tarilabs/rust_tari-build-with-deps:nightly-2020-01-08

commands:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clippy-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2020-06-10
toolchain: nightly-2020-01-08
components: clippy, rustfmt
override: true
- name: Install dependencies
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion applications/tari_base_node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tari_shutdown = { path = "../../infrastructure/shutdown", version = "^0.0" }
tari_mmr = { path = "../../base_layer/mmr", version = "^0.1" }
tari_wallet = { path = "../../base_layer/wallet", version = "^0.1" }
tari_broadcast_channel = "^0.2"
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }

structopt = { version = "0.3.13", default_features = false }
config = { version = "0.9.3" }
Expand Down
2 changes: 1 addition & 1 deletion base_layer/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ avx2 = ["tari_crypto/avx2"]
[dependencies]
tari_comms = { version = "^0.1", path = "../../comms"}
tari_infra_derive = { version = "^0.0", path = "../../infrastructure/derive" }
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_storage = { version = "^0.1", path = "../../infrastructure/storage" }
tari_common = { version= "^0.1", path = "../../common"}
tari_service_framework = { version = "^0.0", path = "../service_framework"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/key_manager/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.0.10"
edition = "2018"

[dependencies]
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
rand = "0.7.2"
digest = "0.8.0"
sha2 = "0.8.0"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/mmr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ criterion = "0.2"
rand="0.7.0"
blake2 = "0.8.0"
tari_infra_derive= { path = "../../infrastructure/derive", version = "^0.0" }
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
serde_json = "1.0"
bincode = "1.1"
[lib]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test-mocks = []
tari_broadcast_channel = "^0.2"
tari_comms = { version = "^0.1", path = "../../comms"}
tari_comms_dht = { version = "^0.1", path = "../../comms/dht"}
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_service_framework = { version = "^0.0", path = "../service_framework"}
tari_shutdown = { version = "^0.0", path="../../infrastructure/shutdown" }
tari_storage = {version = "^0.1", path = "../../infrastructure/storage"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ c_integration = []
[dependencies]
tari_comms = { path = "../../comms", version = "^0.1"}
tari_comms_dht = { path = "../../comms/dht", version = "^0.1"}
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_key_manager = {path = "../key_manager", version = "^0.0"}
tari_p2p = {path = "../p2p", version = "^0.1"}
tari_service_framework = { version = "^0.0", path = "../service_framework"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
tari_comms = { path = "../../comms", version = "^0.1"}
tari_comms_dht = { path = "../../comms/dht", version = "^0.1"}
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_p2p = {path = "../p2p", version = "^0.1"}
tari_wallet = { path = "../wallet", version = "^0.1", features = ["test_harness", "c_integration"]}
tari_shutdown = { path = "../../infrastructure/shutdown", version = "^0.0"}
Expand Down
2 changes: 1 addition & 1 deletion buildtools/windows_inno_installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define MyOrgName "Tari"
#define MyAppName "Base Node"
#define MyAppVersion "0.3.0-0f59836-release"
#define MyAppVersion "?.?.?-???????-release"
#define MyAppPublisher "The Tari Development Community"
#define MyAppURL "https://github.com/tari-project/tari"
#define MyAppSupp "Tari Website"
Expand Down
4 changes: 2 additions & 2 deletions comms/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.1.0"
edition = "2018"

[dependencies]
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_storage = { version="^0.1", path = "../infrastructure/storage" }
tari_shutdown = { version="^0.0", path = "../infrastructure/shutdown" }

Expand All @@ -19,7 +19,7 @@ blake2 = "0.8.1"
bytes = { version = "0.5.x", features=["serde"] }
chrono = { version = "0.4.6", features = ["serde"] }
cidr = "0.1.0"
clear_on_drop = "=0.2.4"
clear_on_drop = "=0.2.3"
data-encoding = "2.2.0"
digest = "0.8.0"
futures = { version = "^0.3", features = ["async-await"]}
Expand Down
2 changes: 1 addition & 1 deletion comms/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test-mocks = []

[dependencies]
tari_comms = { version = "^0.1", path = "../"}
tari_crypto = { version = "^0.4" }
tari_crypto = { version = "^0.3" }
tari_utilities = { version = "^0.1" }
tari_shutdown = { version = "^0.0", path = "../../infrastructure/shutdown"}
tari_storage = { version = "^0.1", path = "../../infrastructure/storage"}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2020-06-10
nightly-2020-01-08