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
tests/common/mod.rs
+5 -5
View File
@@ -14,9 +14,9 @@
//! Common functions for wallet integration tests
extern crate grin_wallet;
use grin_util as util;
use grin_wallet_config as config;
use grin_wallet_impls::test_framework::LocalWalletClient;
use grin_wallet_util::grin_util as util;
use clap::{App, ArgMatches};
use std::path::PathBuf;
@@ -24,17 +24,17 @@ use std::sync::Arc;
use std::{env, fs};
use util::{Mutex, ZeroingString};
use grin_core::global::{self, ChainTypes};
use grin_keychain::ExtKeychain;
use grin_util::{from_hex, static_secp_instance};
use grin_wallet_api::{EncryptedRequest, EncryptedResponse, JsonId};
use grin_wallet_config::{GlobalWalletConfig, WalletConfig, GRIN_WALLET_DIR};
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
use grin_wallet_libwallet::{NodeClient, WalletInfo, WalletInst};
use grin_wallet_util::grin_core::global::{self, ChainTypes};
use grin_wallet_util::grin_keychain::ExtKeychain;
use grin_wallet_util::grin_util::{from_hex, static_secp_instance};
use util::secp::key::{PublicKey, SecretKey};
use grin_api as api;
use grin_wallet::cmd::wallet_args;
use grin_wallet_util::grin_api as api;
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};