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
config/Cargo.toml
+22
View File
@@ -18,5 +18,27 @@ dirs = "2.0"
grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
##### Grin Imports
# For Release
#grin_core = "4.0.0"
#grin_util = "4.0.0"
# For beta release
# grin_core = { 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" }
# For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
# For local testing
# grin_core = { path = "../../grin/core"}
# grin_util = { path = "../../grin/util"}
#####
[dev-dependencies]
pretty_assertions = "0.6"
config/src/lib.rs
+2 -2
View File
@@ -23,8 +23,8 @@
#[macro_use]
extern crate serde_derive;
use grin_wallet_util::grin_core as core;
use grin_wallet_util::grin_util as util;
use grin_core as core;
use grin_util as util;
mod comments;
pub mod config;