Skip to content
This repository has been archived by the owner on Apr 3, 2023. It is now read-only.

Commit

Permalink
Small improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
jaspervdm committed Jul 16, 2019
1 parent 47e83a7 commit 0312f05
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .ci/macos-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ steps:
$(Build.ArtifactStagingDirectory)/wallet713-$(build.my_tag)-$(build.platform)-sha256sum.txt
title: '$(build.my_tag)'
assetUploadMode: 'replace'
addChangeLog: false
addChangeLog: true
compareWith: 'lastFullRelease'
3 changes: 2 additions & 1 deletion .ci/windows-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ steps:
$(Build.ArtifactStagingDirectory)\wallet713-$(build.my_tag)-$(build.platform)-sha256sum.txt
title: '$(build.my_tag)'
assetUploadMode: 'replace'
addChangeLog: false
addChangeLog: true
compareWith: 'lastFullRelease'
40 changes: 40 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ url = "1.7"
parking_lot = "0.6"
semver = "0.9.0"
easy-jsonrpc = "0.5.2"
dont_disappear = "3.0.0"

grin_api = "2.0.0"
grin_core = "2.0.0"
Expand Down
3 changes: 0 additions & 3 deletions src/controller/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ where
println!();

self.start_listeners()?;
cli_message!();
self.command_loop();
Ok(())
}
Expand Down Expand Up @@ -228,7 +227,6 @@ where
println!();
break;
}
cli_message!();
},
Err(err) => {
println!("Unable to read line: {}", err);
Expand Down Expand Up @@ -327,7 +325,6 @@ where
let account = self.api.active_account()?;
let (validated, wallet_info) = self.api.retrieve_summary_info(true, 10)?;
display::info(&account, &wallet_info, validated, true);

}
("listen", Some(m)) => {
let interface = match args::listen_command(m)? {
Expand Down
13 changes: 13 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ extern crate url;
extern crate uuid;
extern crate ws;
extern crate semver;
extern crate dont_disappear;

extern crate grin_api;
#[macro_use]
Expand Down Expand Up @@ -181,6 +182,8 @@ fn main() {

let cli = CLI::new(container);
cli.start();

press_any_key();
}

#[cfg(windows)]
Expand All @@ -192,4 +195,14 @@ pub fn enable_ansi_support() {

#[cfg(not(windows))]
pub fn enable_ansi_support() {
}

#[cfg(windows)]
pub fn press_any_key() {
dont_disappear::any_key_to_continue::default();
}

#[cfg(not(windows))]
pub fn press_any_key() {

}
2 changes: 1 addition & 1 deletion src/wallet/api/owner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ where
}?;

let address = listener.address();
cli_message!("Listener for {} started", address.bright_green());
println!("Listener for {} started", address.bright_green());
c.listeners.insert(interface, listener);
Ok(address)
})
Expand Down

0 comments on commit 0312f05

Please sign in to comment.