fix serde tests

sephynox · Jan 15, 2024 · f9a1bb5 · f9a1bb5
1 parent 50f8a35
commit f9a1bb5
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/src/models/requests/account_channels.rs b/src/models/requests/account_channels.rs
@@ -23,7 +23,7 @@ use super::CommonFields;
 /// ```
 /// use xrpl::models::requests::AccountChannels;
 ///
-/// let json = r#"{"account":"rH6ZiHU1PGamME2LvVTxrgvfjQpppWKGmr","marker":12345678,"command":"account_channels"}"#.to_string();
+/// let json = r#"{"command":"account_channels","account":"rH6ZiHU1PGamME2LvVTxrgvfjQpppWKGmr","marker":12345678}"#.to_string();
 /// let model: AccountChannels = serde_json::from_str(&json).expect("");
 /// let revert: Option<String> = match serde_json::to_string(&model) {
 ///     Ok(model) => Some(model),

diff --git a/src/models/transactions/escrow_create.rs b/src/models/transactions/escrow_create.rs
@@ -163,8 +163,8 @@ mod test_escrow_create_errors {
             "rU4EE1FskCPJw5QkLx1iGgdWiJa6HeqYyb".into(),
             Some(13298498),
             None,
-            Some(14359039),
             None,
+            Some(14359039),
         );
 
         assert_eq!(

diff --git a/src/models/transactions/nftoken_accept_offer.rs b/src/models/transactions/nftoken_accept_offer.rs
@@ -244,7 +244,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"r9spUPhPBfB6kQeF6vPhwmtFwRhBh2JUCG","TransactionType":"NFTokenAcceptOffer","Fee":"12","Sequence":68549302,"LastLedgerSequence":75447550,"Memos":[{"Memo":{"MemoData":"61356534373538372D633134322D346663382D616466362D393666383562356435386437","MemoFormat":null,"MemoType":null}}],"NFTokenSellOffer":"68CD1F6F906494EA08C9CB5CAFA64DFA90D4E834B7151899B73231DE5A0C3B77"}"#;
+        let default_json_str = r#"{"Account":"r9spUPhPBfB6kQeF6vPhwmtFwRhBh2JUCG","TransactionType":"NFTokenAcceptOffer","Fee":"12","LastLedgerSequence":75447550,"Memos":[{"Memo":{"MemoData":"61356534373538372D633134322D346663382D616466362D393666383562356435386437","MemoFormat":null,"MemoType":null}}],"Sequence":68549302,"NFTokenSellOffer":"68CD1F6F906494EA08C9CB5CAFA64DFA90D4E834B7151899B73231DE5A0C3B77"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/nftoken_burn.rs b/src/models/transactions/nftoken_burn.rs
@@ -107,7 +107,7 @@ mod tests {
             "000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65".into(),
             Some("rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B".into()),
         );
-        let default_json_str = r#"{"Account":"rNCFjv8Ek5oDrNiMJ3pw6eLLFtMjZLJnf2","TransactionType":"NFTokenBurn","Owner":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B","Fee":"10","NFTokenID":"000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65"}"#;
+        let default_json_str = r#"{"Account":"rNCFjv8Ek5oDrNiMJ3pw6eLLFtMjZLJnf2","TransactionType":"NFTokenBurn","Fee":"10","NFTokenID":"000B013A95F14B0044F78A264E41713C64B5F89242540EE208C3098E00000D65","Owner":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/offer_cancel.rs b/src/models/transactions/offer_cancel.rs
@@ -99,7 +99,7 @@ mod tests {
             None,
             6,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCancel","Fee":"12","Sequence":7,"LastLedgerSequence":7108629,"OfferSequence":6}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCancel","Fee":"12","LastLedgerSequence":7108629,"Sequence":7,"OfferSequence":6}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/offer_create.rs b/src/models/transactions/offer_create.rs
@@ -219,7 +219,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCreate","Fee":"12","Sequence":8,"LastLedgerSequence":7108682,"TakerGets":"6000000","TakerPays":{"currency":"GKO","issuer":"ruazs5h1qEsqpke88pcqnaseXdm6od2xc","value":"2"}}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"OfferCreate","Fee":"12","LastLedgerSequence":7108682,"Sequence":8,"TakerGets":"6000000","TakerPays":{"currency":"GKO","issuer":"ruazs5h1qEsqpke88pcqnaseXdm6od2xc","value":"2"}}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/payment.rs b/src/models/transactions/payment.rs
@@ -403,7 +403,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"Payment","Fee":"12","Sequence":2,"Flags":131072,"Amount":{"currency":"USD","issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","value":"1"},"Destination":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX"}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"Payment","Fee":"12","Flags":131072,"Sequence":2,"Amount":{"currency":"USD","issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","value":"1"},"Destination":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX"}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/signer_list_set.rs b/src/models/transactions/signer_list_set.rs
@@ -387,7 +387,7 @@ mod tests {
                 SignerEntry::new("raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n".to_string(), 1),
             ]),
         );
-        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SignerListSet","Fee":"12","Sequence":null,"LastLedgerSequence":null,"AccountTxnID":null,"SigningPubKey":null,"SourceTag":null,"TicketSequence":null,"TxnSignature":null,"Flags":null,"Memos":null,"Signers":null,"SignerQuorum":3,"SignerEntries":[{"SignerEntry":{"Account":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SignerWeight":2}},{"SignerEntry":{"Account":"rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v","SignerWeight":1}},{"SignerEntry":{"Account":"raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n","SignerWeight":1}}]}"#;
+        let default_json_str = r#"{"Account":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","TransactionType":"SignerListSet","Fee":"12","SignerQuorum":3,"SignerEntries":[{"SignerEntry":{"Account":"rsA2LpzuawewSBQXkiju3YQTMzW13pAAdW","SignerWeight":2}},{"SignerEntry":{"Account":"rUpy3eEg8rqjqfUoLeBnZkscbKbFsKXC3v","SignerWeight":1}},{"SignerEntry":{"Account":"raKEEVSGnKSD9Zyvxu4z6Pqpm4ABH8FS6n","SignerWeight":1}}]}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/src/models/transactions/ticket_create.rs b/src/models/transactions/ticket_create.rs
@@ -63,7 +63,7 @@ impl<'a> TicketCreate<'a> {
         Self {
             common_fields: CommonFields {
                 account,
-                transaction_type: TransactionType::SignerListSet,
+                transaction_type: TransactionType::TicketCreate,
                 account_txn_id,
                 fee,
                 flags: None,

diff --git a/src/models/transactions/trust_set.rs b/src/models/transactions/trust_set.rs
@@ -145,7 +145,7 @@ mod tests {
             None,
             None,
         );
-        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"TrustSet","Fee":"12","Sequence":12,"LastLedgerSequence":8007750,"Flags":262144,"LimitAmount":{"currency":"USD","issuer":"rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc","value":"100"}}"#;
+        let default_json_str = r#"{"Account":"ra5nK24KXen9AHvsdFTKHSANinZseWnPcX","TransactionType":"TrustSet","Fee":"12","Flags":262144,"LastLedgerSequence":8007750,"Sequence":12,"LimitAmount":{"currency":"USD","issuer":"rsP3mgGb2tcYUrxiLFiHJiQXhsziegtwBc","value":"100"}}"#;
         // Serialize
         let default_json_value = serde_json::to_value(default_json_str).unwrap();
         let serialized_string = serde_json::to_string(&default_txn).unwrap();

diff --git a/tests/integration/clients/mod.rs b/tests/integration/clients/mod.rs
@@ -10,8 +10,8 @@ pub async fn test_websocket_tungstenite_echo() -> Result<()> {
 
     let mut websocket = connect_to_wss_tungstinite_echo().await?;
     let account_info = AccountInfo::new(
-        "rJumr5e1HwiuV543H7bqixhtFreChWTaHH".into(),
         None,
+        "rJumr5e1HwiuV543H7bqixhtFreChWTaHH".into(),
         None,
         None,
         None,
@@ -51,8 +51,8 @@ pub async fn test_embedded_websocket_echo() -> Result<()> {
     let mut websocket =
         connect_to_ws_embedded_websocket_tokio_echo(&mut framed, &mut buffer).await?;
     let account_info = AccountInfo::new(
-        "rJumr5e1HwiuV543H7bqixhtFreChWTaHH".into(),
         None,
+        "rJumr5e1HwiuV543H7bqixhtFreChWTaHH".into(),
         None,
         None,
         None,