Skip to content

Commit 250ca22

Browse files
committed
Fix dependency hell
1 parent f12fcc9 commit 250ca22

File tree

4 files changed

+56
-25
lines changed

4 files changed

+56
-25
lines changed

.cargo/config

Lines changed: 0 additions & 3 deletions
This file was deleted.

Cargo.lock

Lines changed: 51 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adapter/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ web3 = { git = "https://github.com/tomusdrw/rust-web3" }
2020
eth_checksum = "0.1.1"
2121
ethabi = "8.0.1"
2222
tiny-keccak = "1.5"
23-
parity-crypto = { version = "0.4.2", features = ["publickey"], registry = "parity-common" }
24-
ethstore = { version = "0.2.1", registry = "parity-ethereum"}
23+
parity-crypto = { version = "0.4.2", features = ["publickey"], git = "https://github.com/paritytech/parity-common" }
24+
ethstore = { version = "0.2.1", git = "https://github.com/paritytech/parity-ethereum"}
25+
ethkey = { version = "0.4.0", git = "https://github.com/paritytech/parity-ethereum"}
2526
sha2 = "0.8.0"
2627
base64 = "0.10.1"
2728
lazy_static = "1.4.0"

adapter/src/ethereum.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use crate::EthereumChannel;
22
use chrono::Utc;
3+
use ethkey::Password;
34
use ethstore::SafeAccount;
45
use lazy_static::lazy_static;
56
use parity_crypto::publickey::{
6-
public_to_address, recover, verify_address, Address, Message, Password, Signature,
7+
public_to_address, recover, verify_address, Address, Message, Signature,
78
};
89
use primitives::{
910
adapter::{Adapter, AdapterError, AdapterResult, KeystoreOptions, Session},

0 commit comments

Comments
 (0)