diff options
| author | Antoine A <> | 2022-02-06 19:28:19 +0100 |
|---|---|---|
| committer | Antoine A <> | 2022-02-06 19:28:19 +0100 |
| commit | 5db4ac33ffedae7977bb8a86654a5e4ceb7b783c (patch) | |
| tree | 6b4ce3826836af7c6f1e4a118b5456f8f1d5e1bb /eth-wire | |
| parent | 79f0adf3132feab2135ddf51e58e33a7f9c4dc81 (diff) | |
| download | depolymerization-5db4ac33ffedae7977bb8a86654a5e4ceb7b783c.tar.gz depolymerization-5db4ac33ffedae7977bb8a86654a5e4ceb7b783c.tar.bz2 depolymerization-5db4ac33ffedae7977bb8a86654a5e4ceb7b783c.zip | |
Update dependencies and use taler-config to parse configuration
Diffstat (limited to 'eth-wire')
| -rw-r--r-- | eth-wire/Cargo.toml | 3 | ||||
| -rw-r--r-- | eth-wire/src/bin/eth-wire-cli.rs | 2 | ||||
| -rw-r--r-- | eth-wire/src/main.rs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/eth-wire/Cargo.toml b/eth-wire/Cargo.toml index c0ca0c6..9b507f2 100644 --- a/eth-wire/Cargo.toml +++ b/eth-wire/Cargo.toml @@ -3,6 +3,7 @@ name = "eth-wire" version = "0.1.0" edition = "2021" license = "AGPL-3.0-or-later" +rust-version = "1.56.1" [dependencies] # Cli args @@ -13,7 +14,7 @@ serde_json = "1.0.78" serde_repr = "0.1.7" hex = "0.4.3" # Ethereum serializable types -ethereum-types = { version = "0.12.1", default-features = false, features = [ +ethereum-types = { version = "0.13.0", default-features = false, features = [ "serialize", ] } # Error macros diff --git a/eth-wire/src/bin/eth-wire-cli.rs b/eth-wire/src/bin/eth-wire-cli.rs index 3180506..e638157 100644 --- a/eth-wire/src/bin/eth-wire-cli.rs +++ b/eth-wire/src/bin/eth-wire-cli.rs @@ -24,7 +24,7 @@ use common::{ fn main() { init(); let args: Vec<_> = std::env::args().collect(); - let config = CoreConfig::load_from_file(&args[2]); + let config = CoreConfig::load_taler_config(Some(&args[2])); assert_eq!(config.currency, "ETH"); let mut db = Client::connect(&config.db_url, NoTls).expect("Failed to connect to database"); diff --git a/eth-wire/src/main.rs b/eth-wire/src/main.rs index de76e33..8165c4a 100644 --- a/eth-wire/src/main.rs +++ b/eth-wire/src/main.rs @@ -54,7 +54,7 @@ fn main() { common::log::init(); let path = std::env::args().nth(1).unwrap(); - let config = load_eth_config(path); + let config = load_eth_config(Some(&path)); let state: &'static WireState = Box::leak(Box::new(WireState { confirmation: AtomicU16::new(config.confirmation), |