Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #130 from garyyu/warning

Browse source 
cargo.lock update, and remove 3 build warning from cargo 1.35.0
This commit is contained in:
Gary Yu 2019-06-01 11:40:01 +08:00 committed by GitHub
commit cc940fb978
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Cargo.lock generated
View file

@ -753,19 +753,19 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet" name = "grin_wallet"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_api 1.1.0-beta.3", "grin_wallet_api 1.1.0-beta.4",
"grin_wallet_config 1.1.0-beta.3", "grin_wallet_config 1.1.0-beta.4",
"grin_wallet_controller 1.1.0-beta.3", "grin_wallet_controller 1.1.0-beta.4",
"grin_wallet_impls 1.1.0-beta.3", "grin_wallet_impls 1.1.0-beta.4",
"grin_wallet_libwallet 1.1.0-beta.3", "grin_wallet_libwallet 1.1.0-beta.4",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "linefeed 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "prettytable-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -774,16 +774,16 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_api" name = "grin_wallet_api"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_config 1.1.0-beta.3", "grin_wallet_config 1.1.0-beta.4",
"grin_wallet_impls 1.1.0-beta.3", "grin_wallet_impls 1.1.0-beta.4",
"grin_wallet_libwallet 1.1.0-beta.3", "grin_wallet_libwallet 1.1.0-beta.4",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -792,10 +792,10 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_config" name = "grin_wallet_config"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)",
@ -805,18 +805,18 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_controller" name = "grin_wallet_controller"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_api 1.1.0-beta.3", "grin_wallet_api 1.1.0-beta.4",
"grin_wallet_config 1.1.0-beta.3", "grin_wallet_config 1.1.0-beta.4",
"grin_wallet_impls 1.1.0-beta.3", "grin_wallet_impls 1.1.0-beta.4",
"grin_wallet_libwallet 1.1.0-beta.3", "grin_wallet_libwallet 1.1.0-beta.4",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -836,16 +836,16 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_impls" name = "grin_wallet_impls"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_config 1.1.0-beta.3", "grin_wallet_config 1.1.0-beta.4",
"grin_wallet_libwallet 1.1.0-beta.3", "grin_wallet_libwallet 1.1.0-beta.4",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -860,14 +860,14 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_libwallet" name = "grin_wallet_libwallet"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_wallet_config 1.1.0-beta.3", "grin_wallet_config 1.1.0-beta.4",
"grin_wallet_util 1.1.0-beta.3", "grin_wallet_util 1.1.0-beta.4",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -881,7 +881,7 @@ dependencies = [
[[package]] [[package]]
name = "grin_wallet_util" name = "grin_wallet_util"
version = "1.1.0-beta.3" version = "1.1.0-beta.4"
dependencies = [ dependencies = [
"dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_api 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)", "grin_api 1.1.0-beta.2 (git+https://github.com/mimblewimble/grin)",

1
api/src/foreign_rpc.rs
View file

@ -567,7 +567,6 @@ pub fn run_doctest_foreign(
init_tx: bool, init_tx: bool,
init_invoice_tx: bool, init_invoice_tx: bool,
) -> Result<Option<serde_json::Value>, String> { ) -> Result<Option<serde_json::Value>, String> {
use crate::{Foreign, ForeignRpc};
use easy_jsonrpc::Handler; use easy_jsonrpc::Handler;
use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy}; use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy};
use grin_wallet_libwallet::api_impl; use grin_wallet_libwallet::api_impl;

1
api/src/owner_rpc.rs
View file

@ -1336,7 +1336,6 @@ pub fn run_doctest_owner(
lock_tx: bool, lock_tx: bool,
finalize_tx: bool, finalize_tx: bool,
) -> Result<Option<serde_json::Value>, String> { ) -> Result<Option<serde_json::Value>, String> {
use crate::{Owner, OwnerRpc};
use easy_jsonrpc::Handler; use easy_jsonrpc::Handler;
use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy}; use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy};
use grin_wallet_libwallet::api_impl; use grin_wallet_libwallet::api_impl;

2
libwallet/src/internal/tx.rs
View file

@ -23,7 +23,7 @@ use crate::slate::Slate;
use crate::types::{Context, NodeClient, TxLogEntryType, WalletBackend}; use crate::types::{Context, NodeClient, TxLogEntryType, WalletBackend};
use crate::{Error, ErrorKind}; use crate::{Error, ErrorKind};
/// static for incrementing test UUIDs // static for incrementing test UUIDs
lazy_static! { lazy_static! {
static ref SLATE_COUNTER: Mutex<u8> = { Mutex::new(0) }; static ref SLATE_COUNTER: Mutex<u8> = { Mutex::new(0) };
} }