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
util/Cargo.toml
+6 -21
View File
@@ -18,38 +18,23 @@ data-encoding = "2"
sha3 = "0.8"
thiserror = "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" }
grin_util = { 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]
pretty_assertions = "0.6"
util/src/lib.rs
-7
View File
@@ -29,10 +29,3 @@ pub use ov3::OnionV3Error as OnionV3AddressError;
#[allow(missing_docs)]
pub mod byte_ser;
pub use grin_api;
pub use grin_chain;
pub use grin_core;
pub use grin_keychain;
pub use grin_store;
pub use grin_util;
util/src/ov3.rs
+1 -1
View File
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::grin_util::from_hex;
use data_encoding::BASE32;
use ed25519_dalek::PublicKey as DalekPublicKey;
use ed25519_dalek::SecretKey as DalekSecretKey;
use grin_util::from_hex;
use sha3::{Digest, Sha3_256};
use std::convert::TryFrom;
use std::fmt;