Merge branch 'master' into master

wisespace-io · Mar 7, 2024 · f307ae2 · f307ae2
2 parents 699104b + b0e9684
commit f307ae2
Show file tree

Hide file tree

Showing 32 changed files with 183 additions and 601 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-10-15
+          toolchain: nightly
           override: true
           components: clippy
       - run: cargo clippy --all-targets
@@ -26,17 +26,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [msrv, stable, nightly, macos, windows]
+        build: [msrv, stable, macos, windows]
         include:
           - build: msrv
             os: ubuntu-latest
-            rust: 1.56.1
+            rust: 1.76.0
           - build: stable
             os: ubuntu-latest
             rust: stable
-          - build: nightly
-            os: ubuntu-latest
-            rust: nightly
           - build: macos
             os: macos-latest
             rust: stable

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,8 +2,8 @@
 name = "binance"
 version = "0.20.2"
 license = "MIT OR Apache-2.0"
-authors = ["Flavio Oliveira <flavio@wisespace.io>"]
-edition = "2018"
+authors = ["Flavio Oliveira <ollivera-dev@protonmail.com>"]
+edition = "2021"
 
 description = "Rust Library for the Binance API"
 keywords = ["cryptocurrency", "trading", "binance"]
@@ -29,6 +29,7 @@ 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"
 
 [features]
 vendored-tls = [

diff --git a/binance_test_cpp/Makefile b/binance_test_cpp/Makefile
diff --git a/binance_test_cpp/README b/binance_test_cpp/README
diff --git a/binance_test_cpp/libbinance.so b/binance_test_cpp/libbinance.so
diff --git a/binance_test_cpp/libcallcpp.cpp b/binance_test_cpp/libcallcpp.cpp
diff --git a/binance_test_cpp/main b/binance_test_cpp/main
diff --git a/binance_test_cpp/main.cpp b/binance_test_cpp/main.cpp
diff --git a/binance_test_cpp/main.o b/binance_test_cpp/main.o
diff --git a/examples/binance_websockets.rs b/examples/binance_websockets.rs
@@ -5,8 +5,6 @@ use binance::userstream::*;
 use binance::websockets::*;
 use std::sync::atomic::{AtomicBool, Ordering};
 
-
-
 fn main() {
     //user_stream();
     //user_stream_websocket();
@@ -15,8 +13,6 @@ fn main() {
     //all_trades_websocket();
     //last_price_for_one_symbol();
     // multiple_streams();
-
-
 }
 
 fn user_stream() {

diff --git a/examples/libcallcpp.so b/examples/libcallcpp.so
diff --git a/examples/websockets b/examples/websockets
diff --git a/examples/websockets.rs b/examples/websockets.rs
diff --git a/src/account.rs b/src/account.rs
@@ -724,9 +724,7 @@ impl Account {
             .delete_signed(API::Spot(Spot::Order), Some(request))
     }
 
-    pub fn cancel_order_with_client_id_rs<S>() {
-
-    }
+    pub fn cancel_order_with_client_id_rs<S>() {}
     /// Place a test cancel order
     ///
     /// This order is sandboxed: it is validated, but not sent to the matching engine.

diff --git a/src/api.rs b/src/api.rs
@@ -87,6 +87,8 @@ pub enum Futures {
     LvtKlines,
     IndexInfo,
     ChangeInitialLeverage,
+    MarginType,
+    PositionMargin,
     Account,
     OpenOrders,
     UserDataStream,
@@ -161,6 +163,8 @@ impl From<API> for String {
                 Futures::LvtKlines => "/fapi/v1/lvtKlines",
                 Futures::IndexInfo => "/fapi/v1/indexInfo",
                 Futures::ChangeInitialLeverage => "/fapi/v1/leverage",
+                Futures::MarginType => "/fapi/v1/marginType",
+                Futures::PositionMargin => "/fapi/v1/positionMargin",
                 Futures::Account => "/fapi/v2/account",
                 Futures::OpenOrders => "/fapi/v1/openOrders",
                 Futures::UserDataStream => "/fapi/v1/listenKey",