Skip to content

Commit

Permalink
Merge pull request #118 from Yamaguchi/feature/use_rust_tapyrus
Browse files Browse the repository at this point in the history
Feature/use rust tapyrus
  • Loading branch information
rantan authored Jun 10, 2020
2 parents f09cba9 + 00f9404 commit 32d230b
Show file tree
Hide file tree
Showing 38 changed files with 1,091 additions and 1,095 deletions.
1,098 changes: 567 additions & 531 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
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
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

This file was deleted.

Loading

0 comments on commit 32d230b

Please sign in to comment.