github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 15:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

updates based on upstream

Browse Source
This commit is contained in:
yeastplume
2019-02-27 12:50:05 +00:00
parent 6a196ffa90
commit 238cd7225e
6 changed files with 253 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/tests/framework.rs
+4 -3
View File
@@ -32,6 +32,7 @@ use std::default::Default;
use std::ops::Deref;
use std::sync::Arc;
use std::{fs, thread, time};
use p2p::PeerAddr;
/// Just removes all results from previous runs
pub fn clean_all_output(test_name_dir: &str) {
@@ -196,7 +197,7 @@ impl LocalServerContainer {
if self.config.seed_addr.len() > 0 {
seeding_type = p2p::Seeding::List;
seeds = vec![self.config.seed_addr.to_string()];
seeds = vec![PeerAddr::from_ip(self.config.seed_addr.to_string().parse().unwrap())];
}
let s = servers::Server::new(servers::ServerConfig {
@@ -240,7 +241,7 @@ impl LocalServerContainer {
for p in &mut self.peer_list {
println!("{} connecting to peer: {}", self.config.p2p_server_port, p);
let _ = s.connect_peer(p.parse().unwrap());
let _ = s.connect_peer(PeerAddr::from_ip(p.parse().unwrap()));
}
if self.wallet_is_running {
@@ -654,7 +655,7 @@ pub fn config(n: u16, test_name_dir: &str, seed_n: u16) -> servers::ServerConfig
p2p_config: p2p::P2PConfig {
port: 10000 + n,
seeding_type: p2p::Seeding::List,
seeds: Some(vec![format!("127.0.0.1:{}", 10000 + seed_n)]),
seeds: Some(vec![PeerAddr::from_ip(format!("127.0.0.1:{}", 10000 + seed_n).parse().unwrap())]),
..p2p::P2PConfig::default()
},
chain_type: core::global::ChainTypes::AutomatedTesting,
integration/tests/simulnet.rs
+3 -3
View File
@@ -29,7 +29,6 @@ use self::wallet::controller;
use self::wallet::lmdb_wallet::LMDBBackend;
use self::wallet::{HTTPNodeClient, HTTPWalletCommAdapter};
use self::wallet_config::WalletConfig;
use apiwallet::{APIForeign, APIOwner};
use grin_api as api;
use grin_core as core;
use grin_keychain as keychain;
@@ -41,6 +40,7 @@ use std::default::Default;
use std::process::exit;
use std::sync::Arc;
use std::{thread, time};
use p2p::PeerAddr;
use crate::framework::{
config, stop_all_servers, LocalServerContainerConfig, LocalServerContainerPool,
@@ -937,7 +937,7 @@ fn replicate_tx_fluff_failure() {
// Server 2 (another node)
let mut s2_config = framework::config(3001, "tx_fluff", 3001);
s2_config.p2p_config.seeds = Some(vec!["127.0.0.1:13000".to_owned()]);
s2_config.p2p_config.seeds = Some(vec![PeerAddr::from_ip("127.0.0.1:13000".parse().unwrap())]);
s2_config.dandelion_config.embargo_secs = Some(10);
s2_config.dandelion_config.patience_secs = Some(1);
s2_config.dandelion_config.relay_secs = Some(1);
@@ -948,7 +948,7 @@ fn replicate_tx_fluff_failure() {
for i in 0..dl_nodes {
// (create some stem nodes)
let mut s_config = framework::config(3002 + i, "tx_fluff", 3002 + i);
s_config.p2p_config.seeds = Some(vec!["127.0.0.1:13000".to_owned()]);
s_config.p2p_config.seeds = Some(vec![PeerAddr::from_ip("127.0.0.1:13000".parse().unwrap())]);
s_config.dandelion_config.embargo_secs = Some(10);
s_config.dandelion_config.patience_secs = Some(1);
s_config.dandelion_config.relay_secs = Some(1);