Merge pull request #89 from drift-labs/wphan/add_deser_signed_msg_tests

Author: wphan

README.md

@@ -31,16 +31,56 @@ graph TD
     C -->|Place taker + fill txs| I
 ```
 
-## Build
+## Dependency setup
 
 ensure an x86_64 toolchain is configured for building `swift-server`
 
 ```shell
-rustup install 1.83.0-x86_64-apple-darwin
+rustup install 1.87.0-x86_64-apple-darwin
 # run inside swift-server directory
-rustup override set 1.83.0-x86_64-apple-darwin
+rustup override set 1.87.0-x86_64-apple-darwin
+```
+
+if on a newer ARM mac, need to install x86 libraries to run tests and build locally
+```shell
+# install x86-64 brew
+arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+# install x86 deps
+arch -x86_64 /usr/local/bin/brew install librdkafka cyrus-sasl pkg-config zstd lz4 openssl@3
+```
+
+run tests:
+```shell
+# Ensure Intel Homebrew is used first
+export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
+
+# Make sure no ARM include/lib paths are leaking in
+unset CPATH CFLAGS CXXFLAGS CPPFLAGS SDKROOT LIBRARY_PATH DYLD_LIBRARY_PATH
+
+# Run tests under Rosetta with dynamic linking to Intel librdkafka
+arch -x86_64 env \
+  RUSTUP_TOOLCHAIN=1.87.0-x86_64-apple-darwin \
+  RDKAFKA_BUILD=0 \
+  RDKAFKA_STATIC=0 \
+  PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig" \
+  DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/usr/local/opt/librdkafka/lib:/usr/local/opt/cyrus-sasl/lib" \
+  cargo test 
+
+# Run a specific test
+arch -x86_64 env \
+  RUSTUP_TOOLCHAIN=1.87.0-x86_64-apple-darwin \
+  RDKAFKA_BUILD=0 \
+  RDKAFKA_STATIC=0 \
+  PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig" \
+  DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/usr/local/opt/librdkafka/lib:/usr/local/opt/cyrus-sasl/lib" \
+  cargo test \
+  types::messages::tests -- --nocapture
 ```
 
+
+## Build
+
 ```shell
 cargo build --release
 ```

src/types/messages.rs

@@ -361,6 +361,7 @@ mod tests {
     use drift_rs::types::{
         OrderParams, OrderTriggerCondition, OrderType, PositionDirection, PostOnlyParam,
         SignedMsgOrderParamsDelegateMessage, SignedMsgOrderParamsMessage,
+        SignedMsgTriggerOrderParams,
     };
     use nanoid::nanoid;
 
@@ -598,4 +599,112 @@ mod tests {
 
         assert_eq!(order_metadata_json["will_sanitize"], false,);
     }
+
+    #[test]
+    fn deser_signed_msg_type_with_len_from_raw_bytes_v0() {
+        // v0 message, before we started adding fields to the message
+        let payload: Vec<u8> = vec![
+            200, 213, 166, 94, 34, 52, 245, 93, 0, 1, 0, 3, 0, 96, 254, 205, 0, 0, 0, 0, 64, 85,
+            32, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 1, 128, 133, 181, 13, 0, 0, 0, 0,
+            1, 64, 85, 32, 14, 0, 0, 0, 0, 2, 0, 41, 9, 0, 0, 0, 0, 0, 0, 67, 82, 79, 51, 105, 114,
+            71, 49, 1, 0, 28, 78, 14, 0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 1, 64, 58, 105, 13,
+            0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0,
+        ];
+
+        let hex = faster_hex::hex_string(&payload);
+
+        #[derive(serde::Deserialize)]
+        struct Wrapper {
+            #[serde(deserialize_with = "deser_signed_msg_type_with_len")]
+            message: SignedOrderTypeWithLen,
+        }
+
+        let json = format!(r#"{{"message":"{}"}}"#, hex);
+        let wrapper: Wrapper = serde_json::from_str(&json).expect("deserializes");
+
+        assert_eq!(wrapper.message.signed_len, payload.len());
+
+        match wrapper.message.order {
+            SignedOrderType::Authority(m) => {
+                assert_eq!(m.signed_msg_order_params.auction_duration, Some(10));
+                assert_eq!(
+                    m.signed_msg_order_params.auction_start_price,
+                    Some(230000000)
+                );
+                assert_eq!(m.signed_msg_order_params.auction_end_price, Some(237000000));
+                assert_eq!(m.sub_account_id, 2);
+                assert_eq!(m.slot, 2345);
+                assert_eq!(
+                    m.take_profit_order_params,
+                    Some(SignedMsgTriggerOrderParams {
+                        trigger_price: 240000000,
+                        base_asset_amount: 3456000000,
+                    })
+                );
+                assert_eq!(
+                    m.stop_loss_order_params,
+                    Some(SignedMsgTriggerOrderParams {
+                        trigger_price: 225000000,
+                        base_asset_amount: 3456000000,
+                    })
+                );
+                assert_eq!(m.max_margin_ratio, None);
+            }
+            SignedOrderType::Delegated(_) => panic!("expected Authority variant"),
+        }
+    }
+
+    #[test]
+    fn deser_signed_msg_type_with_len_from_raw_bytes_v1() {
+        // v1 message, added max_margin_ratio field
+        let payload: Vec<u8> = vec![
+            200, 213, 166, 94, 34, 52, 245, 93, 0, 1, 0, 3, 0, 96, 254, 205, 0, 0, 0, 0, 64, 85,
+            32, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10, 1, 128, 133, 181, 13, 0, 0, 0, 0,
+            1, 64, 85, 32, 14, 0, 0, 0, 0, 2, 0, 41, 9, 0, 0, 0, 0, 0, 0, 67, 82, 79, 51, 105, 114,
+            71, 49, 1, 0, 28, 78, 14, 0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 1, 64, 58, 105, 13,
+            0, 0, 0, 0, 0, 96, 254, 205, 0, 0, 0, 0, 1, 255, 255,
+        ];
+
+        let hex = faster_hex::hex_string(&payload);
+
+        #[derive(serde::Deserialize)]
+        struct Wrapper {
+            #[serde(deserialize_with = "deser_signed_msg_type_with_len")]
+            message: SignedOrderTypeWithLen,
+        }
+
+        let json = format!(r#"{{"message":"{}"}}"#, hex);
+        let wrapper: Wrapper = serde_json::from_str(&json).expect("deserializes");
+
+        assert_eq!(wrapper.message.signed_len, payload.len());
+
+        match wrapper.message.order {
+            SignedOrderType::Authority(m) => {
+                assert_eq!(m.signed_msg_order_params.auction_duration, Some(10));
+                assert_eq!(
+                    m.signed_msg_order_params.auction_start_price,
+                    Some(230000000)
+                );
+                assert_eq!(m.signed_msg_order_params.auction_end_price, Some(237000000));
+                assert_eq!(m.sub_account_id, 2);
+                assert_eq!(m.slot, 2345);
+                assert_eq!(
+                    m.take_profit_order_params,
+                    Some(SignedMsgTriggerOrderParams {
+                        trigger_price: 240000000,
+                        base_asset_amount: 3456000000,
+                    })
+                );
+                assert_eq!(
+                    m.stop_loss_order_params,
+                    Some(SignedMsgTriggerOrderParams {
+                        trigger_price: 225000000,
+                        base_asset_amount: 3456000000,
+                    })
+                );
+                assert_eq!(m.max_margin_ratio, Some(65535));
+            }
+            SignedOrderType::Delegated(_) => panic!("expected Authority variant"),
+        }
+    }
 }