Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 11 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ path = "src/lib.rs"

[dependencies]
hex = "0.4"
hmac = "0.12.1"
sha2 = "0.10.8"
serde = { version = "1.0.197", features = ["derive"] }
hmac = "0.12"
sha2 = "0.10"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
error-chain = { version = "0.12.4", default-features = false }
reqwest = { version = "0.11.24", features = ["blocking", "json"] }
tungstenite = { version = "0.21.0", features = ["native-tls"] }
url = "2.5.0"
clap = "4.5.2"
error-chain = { version = "0.12", default-features = false }
reqwest = { version = "0.12", features = ["blocking", "json"] }
tungstenite = { version = "0.24", features = ["native-tls", "url"] }
url = "2.5"

[features]
vendored-tls = [
Expand All @@ -38,11 +37,11 @@ vendored-tls = [
]

[dev-dependencies]
csv = "1.3.0"
mockito = "1.4.0"
env_logger = "0.11.2"
csv = "1.3"
mockito = "1.4"
env_logger = "0.11"
criterion = "0.5"
float-cmp = "0.9.0"
float-cmp = "0.10"
serde_json = "1.0"

[[bench]]
Expand Down
6 changes: 3 additions & 3 deletions src/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ impl Account {
S: Into<String>,
{
if !is_start_time_valid(&start_time) {
return bail!("Start time should be less than the current time");
bail!("Start time should be less than the current time");
}

let mut parameters: BTreeMap<String, String> = BTreeMap::new();
Expand All @@ -777,10 +777,10 @@ impl Account {
S: Into<String>,
{
if end_time <= start_time {
return bail!("End time should be greater than start time");
bail!("End time should be greater than start time");
}
if !is_start_time_valid(&start_time) {
return bail!("Start time should be less than the current time");
bail!("Start time should be less than the current time");
}
self.get_trades(symbol, start_time, end_time)
}
Expand Down
4 changes: 2 additions & 2 deletions src/futures/websockets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ impl<'a> FuturesWebSockets<'a> {
pub fn event_loop(&mut self, running: &AtomicBool) -> Result<()> {
while running.load(Ordering::Relaxed) {
if let Some(ref mut socket) = self.socket {
let message = socket.0.read_message()?;
let message = socket.0.read()?;
match message {
Message::Text(msg) => {
if let Err(e) = self.handle_msg(&msg) {
bail!(format!("Error on handling stream message: {}", e));
}
}
Message::Ping(payload) => {
socket.0.write_message(Message::Pong(payload)).unwrap();
socket.0.send(Message::Pong(payload)).unwrap();
}
Message::Pong(_) | Message::Binary(_) | Message::Frame(_) => (),
Message::Close(e) => bail!(format!("Disconnected {:?}", e)),
Expand Down
7 changes: 1 addition & 6 deletions src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,5 @@ fn get_timestamp(start: SystemTime) -> Result<u64> {

pub fn is_start_time_valid(start_time: &u64) -> bool {
let current_time = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs();

if start_time > &current_time {
false
} else {
true
}
return start_time <= &current_time;
}
4 changes: 2 additions & 2 deletions src/websockets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ impl<'a> WebSockets<'a> {
pub fn event_loop(&mut self, running: &AtomicBool) -> Result<()> {
while running.load(Ordering::Relaxed) {
if let Some(ref mut socket) = self.socket {
let message = socket.0.read_message()?;
let message = socket.0.read()?;
match message {
Message::Text(msg) => {
if let Err(e) = self.handle_msg(&msg) {
bail!(format!("Error on handling stream message: {}", e));
}
}
Message::Ping(payload) => {
socket.0.write_message(Message::Pong(payload)).unwrap();
socket.0.send(Message::Pong(payload)).unwrap();
}
Message::Pong(_) | Message::Binary(_) | Message::Frame(_) => (),
Message::Close(e) => bail!(format!("Disconnected {:?}", e)),
Expand Down