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

* 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

controller/Cargo.toml

@@ -31,12 +31,58 @@ thiserror = "1"
 qr_code = "1.1.0"
 
 grin_wallet_util = { path = "../util", version = "5.2.0-alpha.1" }
-
 grin_wallet_api = { path = "../api", version = "5.2.0-alpha.1" }
 grin_wallet_impls = { path = "../impls", version = "5.2.0-alpha.1" }
 grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-alpha.1" }
 grin_wallet_config = { path = "../config", version = "5.2.0-alpha.1" }
 
+##### Grin Imports
+
+# For Release
+#grin_core = "4.0.0"
+#grin_keychain = "4.0.0"
+#grin_util = "4.0.0"
+#grin_api = "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_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" }
+
+# For bleeding edge
+ grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+ grin_keychain = { 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" }
+
+# For local testing
+# grin_core = { path = "../../grin/core"}
+# grin_keychain = { path = "../../grin/keychain"}
+# grin_util = { path = "../../grin/util"}
+# grin_api = { path = "../../grin/api"}
+
+#####
+
 [dev-dependencies]
 ed25519-dalek = "1.0.0-pre.4"
-remove_dir_all = "0.7"
+remove_dir_all = "0.7"
+
+##### Grin Imports
+
+# For Release
+# grin_chain = "4.0.0"
+
+# For beta release
+
+# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.0.0-beta.2" }
+
+# For bleeding edge
+  grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+
+# For local testing
+# grin_chain = { path = "../../grin/chain"}
+
+##### 
+

controller/src/lib.rs

@@ -21,14 +21,14 @@ extern crate prettytable;
 extern crate log;
 #[macro_use]
 extern crate lazy_static;
+use grin_api as api;
+use grin_core as core;
+use grin_keychain as keychain;
+use grin_util as util;
 use grin_wallet_api as apiwallet;
 use grin_wallet_config as config;
 use grin_wallet_impls as impls;
 use grin_wallet_libwallet as libwallet;
-use grin_wallet_util::grin_api as api;
-use grin_wallet_util::grin_core as core;
-use grin_wallet_util::grin_keychain as keychain;
-use grin_wallet_util::grin_util as util;
 
 pub mod command;
 pub mod controller;

controller/tests/accounts.rs

@@ -17,8 +17,8 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
-use grin_wallet_util::grin_core as core;
-use grin_wallet_util::grin_keychain as keychain;
+use grin_core as core;
+use grin_keychain as keychain;
 
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};

controller/tests/build_chain.rs

@@ -20,7 +20,7 @@ extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_libwallet as libwallet;
 
-use grin_wallet_util::grin_core as core;
+use grin_core as core;
 
 use self::libwallet::{InitTxArgs, Slate};
 use impls::test_framework::{self, LocalWalletClient};

controller/tests/build_output.rs

@@ -17,12 +17,12 @@ extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_util;
 
-use grin_wallet_libwallet as libwallet;
-use grin_wallet_util::grin_core::core::OutputFeatures;
-use grin_wallet_util::grin_keychain::{
+use grin_core::core::OutputFeatures;
+use grin_keychain::{
 	mnemonic, BlindingFactor, ExtKeychain, ExtKeychainPath, Keychain, SwitchCommitmentType,
 };
-use grin_wallet_util::grin_util::{secp, ZeroingString};
+use grin_util::{secp, ZeroingString};
+use grin_wallet_libwallet as libwallet;
 use impls::test_framework::LocalWalletClient;
 use rand::{thread_rng, Rng};
 use std::sync::atomic::Ordering;

controller/tests/check.rs

@@ -17,8 +17,8 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
-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;
 
 use self::core::consensus;
 use self::core::global;

controller/tests/common/mod.rs

@@ -16,9 +16,9 @@ extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_libwallet as libwallet;
 
-use grin_wallet_util::grin_core as core;
-use grin_wallet_util::grin_keychain as keychain;
-use grin_wallet_util::grin_util as util;
+use grin_core as core;
+use grin_keychain as keychain;
+use grin_util as util;
 
 use self::core::global;
 use self::core::global::ChainTypes;

controller/tests/file.rs

@@ -17,8 +17,8 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
+use grin_core as core;
 use grin_wallet_libwallet as libwallet;
-use grin_wallet_util::grin_core as core;
 
 use impls::test_framework::{self, LocalWalletClient};
 use impls::{PathToSlate, SlateGetter as _, SlatePutter as _};

controller/tests/invoice.rs

@@ -17,8 +17,8 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
+use grin_core as core;
 use grin_wallet_libwallet as libwallet;
-use grin_wallet_util::grin_core as core;
 
 use impls::test_framework::{self, LocalWalletClient};
 use libwallet::{InitTxArgs, IssueInvoiceTxArgs, Slate, SlateState};

controller/tests/no_change.rs

@@ -17,7 +17,7 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
-use grin_wallet_util::grin_core as core;
+use grin_core as core;
 
 use grin_wallet_libwallet as libwallet;
 use impls::test_framework::{self, LocalWalletClient};

controller/tests/repost.rs

@@ -18,7 +18,7 @@ extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_libwallet as libwallet;
 
-use grin_wallet_util::grin_core as core;
+use grin_core as core;
 
 use self::libwallet::{InitTxArgs, Slate};
 use impls::test_framework::{self, LocalWalletClient};

controller/tests/revert.rs

@@ -16,20 +16,20 @@
 mod common;
 
 use common::{clean_output_dir, create_wallet_proxy, setup};
+use grin_chain as chain;
+use grin_core as core;
+use grin_core::core::hash::Hashed;
+use grin_core::core::Transaction;
+use grin_core::global;
+use grin_keychain::ExtKeychain;
+use grin_util::secp::key::SecretKey;
+use grin_util::Mutex;
 use grin_wallet_controller::controller::owner_single_use as owner;
 use grin_wallet_impls::test_framework::*;
 use grin_wallet_impls::{DefaultLCProvider, PathToSlate, SlatePutter};
 use grin_wallet_libwallet as libwallet;
 use grin_wallet_libwallet::api_impl::types::InitTxArgs;
 use grin_wallet_libwallet::WalletInst;
-use grin_wallet_util::grin_chain as chain;
-use grin_wallet_util::grin_core as core;
-use grin_wallet_util::grin_core::core::hash::Hashed;
-use grin_wallet_util::grin_core::core::Transaction;
-use grin_wallet_util::grin_core::global;
-use grin_wallet_util::grin_keychain::ExtKeychain;
-use grin_wallet_util::grin_util::secp::key::SecretKey;
-use grin_wallet_util::grin_util::Mutex;
 use log::error;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;

controller/tests/self_send.rs

@@ -17,7 +17,7 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
-use grin_wallet_util::grin_core as core;
+use grin_core as core;
 
 use grin_wallet_libwallet as libwallet;
 use impls::test_framework::{self, LocalWalletClient};

controller/tests/slatepack.rs

@@ -17,8 +17,8 @@ extern crate log;
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 
+use grin_core as core;
 use grin_wallet_libwallet as libwallet;
-use grin_wallet_util::grin_core as core;
 
 use impls::test_framework::{self, LocalWalletClient};
 use impls::{PathToSlatepack, SlatePutter as _};

controller/tests/transaction.rs

@@ -18,7 +18,7 @@ extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_libwallet as libwallet;
 
-use grin_wallet_util::grin_core as core;
+use grin_core as core;
 
 use self::core::core::transaction;
 use self::core::global;