github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove grin lib re-exports from util crate (#661)

Browse Source 
* updated util and libwallet with thiserror

* update impl crate to thiserror

* api crate converted to thiserror

* update of controller crate to thiserror

* update final bin + tests to thiserror

* update unused import

* remove failure derive

* reset import of grin to master

* update cargo lock

* update from master

* remove grin libs re-export from util crate :(

* temp local

* point code at bleeding edge grin master branch
This commit is contained in:
Yeastplume
2022-08-08 12:08:25 +01:00
committed by GitHub
parent 64cab53b1b
commit 8384a3ebb0
49 changed files with 398 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
impls/Cargo.toml
+37
View File
@@ -40,5 +40,42 @@ grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
##### Grin Imports
# For Release
#grin_core = "4.0.0"
#grin_keychain = "4.0.0"
#grin_chain = "4.0.0"
#grin_util = "4.0.0"
#grin_api = "4.0.0"
#grin_store = "4.0.0"
# For beta release
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2"}
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
# For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# For local testing
# grin_core = { path = "../../grin/core"}
# grin_keychain = { path = "../../grin/keychain"}
# grin_chain = { path = "../../grin/chain"}
# grin_util = { path = "../../grin/util"}
# grin_api = { path = "../../grin/api"}
# grin_store = { path = "../../grin/store"}
#####
[dev-dependencies]
"remove_dir_all" = "0.7"
impls/src/adapters/slatepack.rs
+1 -1
View File
@@ -101,7 +101,7 @@ mod tests {
use super::*;
use std::fs;
use grin_wallet_util::grin_core::global;
use grin_core::global;
fn clean_output_dir(test_dir: &str) {
let _ = remove_dir_all::remove_dir_all(test_dir);
impls/src/lib.rs
+6 -6
View File
@@ -24,13 +24,13 @@ extern crate serde_derive;
extern crate log;
#[macro_use]
extern crate serde_json;
use grin_api as api;
use grin_chain as chain;
use grin_core as core;
use grin_keychain as keychain;
use grin_store as store;
use grin_util as util;
use grin_wallet_libwallet as libwallet;
use grin_wallet_util::grin_api as api;
use grin_wallet_util::grin_chain as chain;
use grin_wallet_util::grin_core as core;
use grin_wallet_util::grin_keychain as keychain;
use grin_wallet_util::grin_store as store;
use grin_wallet_util::grin_util as util;
use grin_wallet_config as config;
impls/src/lifecycle/default.rs
+1 -1
View File
@@ -24,7 +24,7 @@ use crate::lifecycle::seed::WalletSeed;
use crate::util::secp::key::SecretKey;
use crate::util::ZeroingString;
use crate::LMDBBackend;
use grin_wallet_util::grin_util::logger::LoggingConfig;
use grin_util::logger::LoggingConfig;
use std::fs;
use std::path::PathBuf;