Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/use rust tapyrus #118

Merged
merged 5 commits into from
Jun 10, 2020
Merged

Feature/use rust tapyrus #118

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b776e8e
Replace rust-bitcoin library to rust-tapyrus
Yamaguchi Apr 20, 2020
0d5f9e3
Replace tapyrus-signer::blockdata::Block to tapyrus::blockdata::block…
Yamaguchi Apr 22, 2020
86ea9d7
cargo fmt
Yamaguchi Jun 9, 2020
f323a5e
Update libraries
Yamaguchi Jun 9, 2020
00f9404
Remove an unnecessary test
Yamaguchi Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,098 changes: 567 additions & 531 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"

[dependencies]
http = "0.1.17"
bitcoin = { version = "0.20.0", features = ["serde"] }
tapyrus = { git = "https://github.com/chaintope/rust-tapyrus", tag = "v0.2.0", features = ["use-serde", "rand"] }
secp256k1 = "0.15.3"
log = "0.4.6"
env_logger = "0.6.1"
Expand All @@ -22,7 +22,7 @@ base64 = "0.10.1"
redis = "0.10.0"
clap = "2.33.0"
toml = "0.5"
curv = { git = "https://github.com/KZen-networks/curv" , tag = "v0.2.0", features = ["ec_secp256k1"]}
curv = { git = "https://github.com/KZen-networks/curv", tag = "v0.2.0", features = ["ec_secp256k1"]}
sha2 = "0.8.1"
signal-hook = "0.1.12"
libc = "0.2.66"
Expand Down
6 changes: 3 additions & 3 deletions src/bin/tapyrus-signerd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

extern crate bitcoin;
extern crate clap;
extern crate daemonize;
extern crate env_logger;
extern crate log;
extern crate redis;
extern crate tapyrus;
extern crate tapyrus_signer;

use bitcoin::PublicKey;
use tapyrus::PublicKey;

use daemonize::Daemonize;
use std::fs::OpenOptions;
Expand Down Expand Up @@ -164,9 +164,9 @@ fn load_federations(pubkey: &PublicKey, path: &Path) -> Federations {
#[cfg(test)]
mod tests {
use crate::{connect_rpc, connect_signer_network, load_federations};
use bitcoin::PublicKey;
use std::path::Path;
use std::str::FromStr;
use tapyrus::PublicKey;
use tapyrus_signer::command_args::{RedisConfig, RpcConfig};

#[test]
Expand Down
336 changes: 0 additions & 336 deletions src/blockdata.rs
View file
Open in desktop

This file was deleted.

Loading