Skip to content

Commit

Permalink
addd comment
Browse files Browse the repository at this point in the history
  • Loading branch information
SWvheerden committed Jun 18, 2021
1 parent 87fc9fe commit 99f608a
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion applications/tari_app_grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2018"
tari_common_types = { version = "^0.8", path = "../../base_layer/common_types"}
tari_core = { path = "../../base_layer/core"}
tari_wallet = { path = "../../base_layer/wallet"}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge #switch back to official after merge
tari_comms = { path = "../../comms"}

chrono = "0.4.6"
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_app_utilities/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
tari_comms = { path = "../../comms"}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_common = { path = "../../common" }
tari_p2p = { path = "../../base_layer/p2p" }
tari_wallet = { path = "../../base_layer/wallet" }
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_base_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tari_common = { path = "../../common" }
tari_comms = { path = "../../comms", features = ["rpc"]}
tari_comms_dht = { path = "../../comms/dht"}
tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"]}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_mmr = { path = "../../base_layer/mmr" }
tari_p2p = { path = "../../base_layer/p2p" }
tari_service_framework = { path = "../../base_layer/service_framework"}
Expand Down
3 changes: 1 addition & 2 deletions applications/tari_console_wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
tari_wallet = { path = "../../base_layer/wallet" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_common = { path = "../../common" }
tari_app_utilities = { path = "../tari_app_utilities"}
tari_comms = { path = "../../comms"}
Expand Down Expand Up @@ -43,4 +43,3 @@ features = ["transactions", "mempool_proto", "base_node_proto"]
version = "^0.12"
default-features = false
features = ["crossterm"]

2 changes: 1 addition & 1 deletion applications/tari_merge_mining_proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tari_app_grpc = { path = "../tari_app_grpc" }
tari_common = { path = "../../common" }
tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"]}
tari_app_utilities = { path = "../tari_app_utilities"}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_utilities = "^0.3"

anyhow = "1.0.40"
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_mining_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ thiserror = "1.0"


[dev-dependencies]
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
prost-types = "0.6.1"
chrono = "0.4"
2 changes: 1 addition & 1 deletion applications/test_faucet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tari_utilities = "^0.3"
serde = { version = "1.0.97", features = ["derive"] }
serde_json = "1.0"
rand = "0.7.2"
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge

[dependencies.tari_core]
version = "^0.8"
Expand Down
2 changes: 1 addition & 1 deletion base_layer/common_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ edition = "2018"
[dependencies]
futures = {version = "^0.3.1", features = ["async-await"] }
rand = "0.7.2"
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
serde = { version = "1.0.106", features = ["derive"] }
tokio = { version="^0.2", features = ["blocking", "time", "sync"] }
2 changes: 1 addition & 1 deletion base_layer/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tari_common_types = { version = "^0.8", path = "../../base_layer/common_types"}
tari_comms = { version = "^0.8", path = "../../comms"}
tari_comms_dht = { version = "^0.8", path = "../../comms/dht"}
tari_comms_rpc_macros = { version = "^0.8", path = "../../comms/rpc_macros"}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_mmr = { version = "^0.8", path = "../../base_layer/mmr", optional = true }
tari_p2p = { version = "^0.8", path = "../../base_layer/p2p" }
tari_service_framework = { version = "^0.8", path = "../service_framework"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/key_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.8.11"
edition = "2018"

[dependencies]
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ criterion = { version="0.2", optional = true }
rand="0.7.0"
blake2 = "0.8.0"
tari_infra_derive= { path = "../../infrastructure/derive", version = "^0.8" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
serde_json = "1.0"
bincode = "1.1"
[lib]
Expand Down
2 changes: 1 addition & 1 deletion base_layer/p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
tari_comms = { version = "^0.8", path = "../../comms"}
tari_comms_dht = { version = "^0.8", path = "../../comms/dht"}
tari_common = { version= "^0.8", path = "../../common" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_service_framework = { version = "^0.8", path = "../service_framework"}
tari_shutdown = { version = "^0.8", path="../../infrastructure/shutdown" }
tari_storage = { version = "^0.8", path = "../../infrastructure/storage"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2018"
tari_common_types = { version = "^0.8", path = "../../base_layer/common_types"}
tari_comms = { version = "^0.8", path = "../../comms"}
tari_comms_dht = { version = "^0.8", path = "../../comms/dht" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_key_manager = { version = "^0.8", path = "../key_manager" }
tari_p2p = { version = "^0.8", path = "../p2p" }
tari_service_framework = { version = "^0.8", path = "../service_framework"}
Expand Down
2 changes: 1 addition & 1 deletion base_layer/wallet_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
tari_comms = { version = "^0.8", path = "../../comms" }
tari_comms_dht = { version = "^0.8", path = "../../comms/dht" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_key_manager = { version = "^0.8", path = "../key_manager" }
tari_p2p = { version = "^0.8", path = "../p2p" }
tari_wallet = { version = "^0.8", path = "../wallet", features = ["test_harness", "c_integration"]}
Expand Down
2 changes: 1 addition & 1 deletion comms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version = "0.8.11"
edition = "2018"

[dependencies]
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_storage = { version = "^0.8", path = "../infrastructure/storage" }
tari_shutdown = { version="^0.8", path = "../infrastructure/shutdown" }

Expand Down
2 changes: 1 addition & 1 deletion comms/dht/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
tari_common = { version = "^0.8", path = "../../common"}
tari_comms = { version = "^0.8", path = "../", features = ["rpc"]}
tari_comms_rpc_macros = { version = "^0.8", path = "../rpc_macros"}
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" }
tari_crypto = { git = "https://github.com/SWvheerden/tari-crypto.git", rev = "3e8817" } #switch back to official after merge
tari_utilities = { version = "^0.3" }
tari_shutdown = { version = "^0.8", path = "../../infrastructure/shutdown"}
tari_storage = { version = "^0.8", path = "../../infrastructure/storage"}
Expand Down

0 comments on commit 99f608a

Please sign in to comment.