Skip to content

Commit 0c60947

Browse files
committed
fix deser
1 parent 5ab8d66 commit 0c60947

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bincode = "1"
2626
clap = { version = "4.0", features = ["derive"] }
2727
dashmap = "6.1.0"
2828
dotenv = "0.15.0"
29-
drift-rs = { git = "https://github.com/drift-labs/drift-rs.git", rev = "5512dd64" }
29+
drift-rs = { git = "https://github.com/drift-labs/drift-rs.git", rev = "0fa94343" }
3030
ed25519-dalek = "1.0.1"
3131
env_logger = "0.11"
3232
faster-hex = "0.10.0"

src/types/messages.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use drift_rs::{
1212
types::{MarketType, SignedMsgOrderParamsDelegateMessage},
1313
};
1414
use ed25519_dalek::{PublicKey, Signature, Verifier};
15-
use serde::de::{value::StrDeserializer, IntoDeserializer};
15+
use serde::de::value::StrDeserializer;
1616
use serde_json::json;
1717
use solana_sdk::{pubkey::Pubkey, transaction::VersionedTransaction};
1818

@@ -88,11 +88,10 @@ impl OrderMetadataAndMessage {
8888
/// DEV: this performs a deserialization of the raw payload
8989
pub fn order_info(&self) -> SignedMessageInfo {
9090
// expect: message already succesfully deserialized by this point
91-
deser_signed_msg_type::<StrDeserializer<serde::de::value::Error>>(
92-
self.order_message_str.as_str().into_deserializer(),
93-
)
94-
.expect("deserializes")
95-
.info(&self.taker_authority)
91+
let deser =
92+
StrDeserializer::<serde::de::value::Error>::new(self.order_message_str.as_str());
93+
let res = deser_signed_msg_type(deser);
94+
res.unwrap().info(&self.taker_authority)
9695
}
9796
/// Borsh serialize and
9897
/// base64 encode the message
@@ -505,6 +504,7 @@ mod tests {
505504
.encode();
506505
let order_metadata = OrderMetadataAndMessage::decode(&encoded).unwrap();
507506
assert_eq!(order_metadata.encode(), encoded);
507+
dbg!(&order_metadata.order_info().order_params);
508508
}
509509

510510
#[test]

src/ws_server.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ pub struct ServerParams {
118118
pub metrics: WsServerMetrics,
119119
}
120120

121-
#[derive(serde::Serialize)]
122-
pub struct TestMessage {
123-
message: String,
124-
}
125-
126121
impl Challenge {
127122
/// Try to authenticate
128123
///

0 commit comments

Comments
 (0)