From 46c9a5e43616e31d4d9f946fb58b49fec4509e34 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Tue, 20 Sep 2016 13:39:52 -0600 Subject: [PATCH] Clean up constants. --- src/consts.rs | 1 + src/coordinator.rs | 10 ++++++---- src/player.rs | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/consts.rs diff --git a/src/consts.rs b/src/consts.rs new file mode 100644 index 0000000..c2767be --- /dev/null +++ b/src/consts.rs @@ -0,0 +1 @@ +pub const NETWORK_MAGIC: [u8; 8] = [0xee, 0xee, 0x1f, 0xcc, 0x1c, 0xee, 0xcc, 0x19]; diff --git a/src/coordinator.rs b/src/coordinator.rs index 9eb1ec3..bd09217 100644 --- a/src/coordinator.rs +++ b/src/coordinator.rs @@ -15,9 +15,12 @@ extern crate time; extern crate ansi_term; mod protocol; +use self::protocol::*; + +mod consts; +use self::consts::*; use snark::*; -use self::protocol::*; use std::net::{TcpListener, TcpStream}; use std::io::{Read, Write}; use std::collections::HashMap; @@ -31,9 +34,8 @@ use bincode::rustc_serialize::{encode_into, decode_from}; use std::time::Duration; const USE_DUMMY_CS: bool = true; -const LISTEN_ADDR: &'static str = "127.0.0.1:65530"; -const NETWORK_MAGIC: [u8; 8] = [0xff, 0xff, 0x1f, 0xbb, 0x1c, 0xee, 0x00, 0x19]; -const PLAYERS: usize = 2; +const LISTEN_ADDR: &'static str = "0.0.0.0:65530"; +const PLAYERS: usize = 3; pub const THREADS: usize = 8; #[derive(Clone)] diff --git a/src/player.rs b/src/player.rs index 58cdb96..9674e09 100644 --- a/src/player.rs +++ b/src/player.rs @@ -11,6 +11,8 @@ extern crate bincode; mod protocol; use self::protocol::*; +mod consts; +use self::consts::*; use rand::Rng; use std::net::{TcpStream}; @@ -22,7 +24,6 @@ use bincode::SizeLimit::Infinite; use bincode::rustc_serialize::{encode_into, decode_from}; const COORDINATOR_ADDR: &'static str = "127.0.0.1:65530"; -const NETWORK_MAGIC: [u8; 8] = [0xff, 0xff, 0x1f, 0xbb, 0x1c, 0xee, 0x00, 0x19]; pub const THREADS: usize = 8; struct ConnectionHandler {