Skip to content

Commit

Permalink
Remove wallet code [1.1.0] (#2593)
Browse files Browse the repository at this point in the history
* Bump version to 1.1.0

* remove wallet crate

* wallet extracted + mine_block structs

* remove wallet doc

* remove unnecessary cargo deps

* rustfmt

* remove wallet from travis matrix

* move integration tests into separate crate

* rustfmt

* move integration crate to wallet
  • Loading branch information
yeastplume authored Feb 21, 2019
1 parent cbac14c commit ea4b4fc
Show file tree
Hide file tree
Showing 83 changed files with 465 additions and 18,562 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ matrix:
- os: linux
env: TEST_SUITE=pool-p2p-src
- os: linux
env: TEST_SUITE=keychain-wallet
env: TEST_SUITE=keychain
- os: linux
env: TEST_SUITE=api-util-store
- os: osx
Expand Down
917 changes: 353 additions & 564 deletions Cargo.lock

Large diffs are not rendered by default.

28 changes: 11 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin"
version = "1.0.1"
version = "1.1.0"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -12,7 +12,7 @@ build = "src/build/build.rs"
edition = "2018"

[workspace]
members = ["api", "chain", "config", "core", "keychain", "p2p", "servers", "store", "util", "pool", "wallet"]
members = ["api", "chain", "config", "core", "keychain", "p2p", "servers", "store", "util", "pool"]
exclude = ["etc/gen_gen"]

[[bin]]
Expand All @@ -23,25 +23,22 @@ path = "src/bin/grin.rs"
blake2-rfc = "0.2"
chrono = "0.4.4"
clap = { version = "2.31", features = ["yaml"] }
rpassword = "2.0.0"
ctrlc = { version = "3.1", features = ["termination"] }
humansize = "1.1.0"
serde = "1"
serde_json = "1"
log = "0.4"
term = "0.5"
linefeed = "0.5"
failure = "0.1"
failure_derive = "0.1"

grin_api = { path = "./api", version = "1.0.1" }
grin_config = { path = "./config", version = "1.0.1" }
grin_core = { path = "./core", version = "1.0.1" }
grin_keychain = { path = "./keychain", version = "1.0.1" }
grin_p2p = { path = "./p2p", version = "1.0.1" }
grin_servers = { path = "./servers", version = "1.0.1" }
grin_util = { path = "./util", version = "1.0.1" }
grin_wallet = { path = "./wallet", version = "1.0.1" }
grin_api = { path = "./api", version = "1.1.0" }
grin_config = { path = "./config", version = "1.1.0" }
grin_core = { path = "./core", version = "1.1.0" }
grin_keychain = { path = "./keychain", version = "1.1.0" }
grin_p2p = { path = "./p2p", version = "1.1.0" }
grin_servers = { path = "./servers", version = "1.1.0" }
grin_util = { path = "./util", version = "1.1.0" }

[target.'cfg(windows)'.dependencies]
cursive = { version = "0.10.0", default-features = false, features = ["pancurses-backend"] }
Expand All @@ -53,10 +50,7 @@ cursive = "0.9.0"

[build-dependencies]
built = "0.3"
reqwest = "0.9"
flate2 = "1.0"
tar = "0.4"

[dev-dependencies]
grin_chain = { path = "./chain", version = "1.0.1" }
grin_store = { path = "./store", version = "1.0.1" }
grin_chain = { path = "./chain", version = "1.1.0" }
grin_store = { path = "./store", version = "1.1.0" }
2 changes: 1 addition & 1 deletion api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_api"
version = "1.0.1"
version = "1.1.0"
authors = ["Grin Developers <[email protected]>"]
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down
10 changes: 5 additions & 5 deletions chain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_chain"
version = "1.0.1"
version = "1.1.0"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -22,10 +22,10 @@ serde_derive = "1"
chrono = "0.4.4"
lru-cache = "0.1"

grin_core = { path = "../core", version = "1.0.1" }
grin_keychain = { path = "../keychain", version = "1.0.1" }
grin_store = { path = "../store", version = "1.0.1" }
grin_util = { path = "../util", version = "1.0.1" }
grin_core = { path = "../core", version = "1.1.0" }
grin_keychain = { path = "../keychain", version = "1.1.0" }
grin_store = { path = "../store", version = "1.1.0" }
grin_util = { path = "../util", version = "1.1.0" }

[dev-dependencies]
env_logger = "0.5"
Expand Down
11 changes: 5 additions & 6 deletions config/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_config"
version = "1.0.1"
version = "1.1.0"
authors = ["Grin Developers <[email protected]>"]
description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,11 +16,10 @@ serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"

grin_core = { path = "../core", version = "1.0.1" }
grin_servers = { path = "../servers", version = "1.0.1" }
grin_p2p = { path = "../p2p", version = "1.0.1" }
grin_util = { path = "../util", version = "1.0.1" }
grin_wallet = { path = "../wallet", version = "1.0.1" }
grin_core = { path = "../core", version = "1.1.0" }
grin_servers = { path = "../servers", version = "1.1.0" }
grin_p2p = { path = "../p2p", version = "1.1.0" }
grin_util = { path = "../util", version = "1.1.0" }

[dev-dependencies]
pretty_assertions = "0.5.1"
104 changes: 0 additions & 104 deletions config/src/comments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -345,110 +345,6 @@ fn comments() -> HashMap<String, String> {
.to_string(),
);

retval.insert(
"[wallet]".to_string(),
"
#########################################
### WALLET CONFIGURATION ###
#########################################
"
.to_string(),
);

retval.insert(
"api_listen_interface".to_string(),
"
#host IP for wallet listener, change to \"0.0.0.0\" to receive grins
"
.to_string(),
);

retval.insert(
"api_listen_port".to_string(),
"
#path of TLS certificate file, self-signed certificates are not supported
#tls_certificate_file = \"\"
#private key for the TLS certificate
#tls_certificate_key = \"\"
#port for wallet listener
"
.to_string(),
);

retval.insert(
"owner_api_listen_port".to_string(),
"
#port for wallet owner api
"
.to_string(),
);

retval.insert(
"api_secret_path".to_string(),
"
#path of the secret token used by the API to authenticate the calls
#comment it to disable basic auth
"
.to_string(),
);
retval.insert(
"check_node_api_http_addr".to_string(),
"
#where the wallet should find a running node
"
.to_string(),
);
retval.insert(
"node_api_secret_path".to_string(),
"
#location of the node api secret for basic auth on the Grin API
"
.to_string(),
);
retval.insert(
"owner_api_include_foreign".to_string(),
"
#include the foreign API endpoints on the same port as the owner
#API. Useful for networking environments like AWS ECS that make
#it difficult to access multiple ports on a single service.
"
.to_string(),
);
retval.insert(
"data_file_dir".to_string(),
"
#where to find wallet files (seed, data, etc)
"
.to_string(),
);
retval.insert(
"no_commit_cache".to_string(),
"
#If true, don't store calculated commits in the database
#better privacy, but at a performance cost of having to
#re-calculate commits every time they're used
"
.to_string(),
);
retval.insert(
"dark_background_color_scheme".to_string(),
"
#Whether to use the black background color scheme for command line
"
.to_string(),
);
retval.insert(
"keybase_notify_ttl".to_string(),
"
#The exploding lifetime for keybase notification on coins received.
#Unit: Minute. Default value 1440 minutes for one day.
#Refer to https://keybase.io/blog/keybase-exploding-messages for detail.
#To disable this notification, set it as 0.
"
.to_string(),
);

retval.insert(
"[logging]".to_string(),
"
Expand Down
Loading

0 comments on commit ea4b4fc

Please sign in to comment.