Restore order for value_transfers and messages

libtonode-tests/tests/concrete.rs

@@ -348,12 +348,25 @@ mod fast {
         let value_transfers_charlie = &recipient
             .messages_containing(Some(&charlie.encode(&recipient.config().chain)))
             .await;
-        let all_vts = &recipient.messages_containing(None).await;
 
-        println!("ALL VTS");
-        dbg!(all_vts);
+        let all_vts = &recipient.value_transfers().await;
+        let all_messages = &recipient.messages_containing(None).await;
+
         assert_eq!(value_transfers_bob.0.len(), 3);
         assert_eq!(value_transfers_charlie.0.len(), 2);
+
+        // Also asserting the order now (sorry juanky)
+        // ALL MESSAGES (First one should be the oldest one)
+        assert!(all_messages
+            .0
+            .windows(2)
+            .all(|pair| { pair[0].blockheight() <= pair[1].blockheight() }));
+
+        // ALL VTS (First one should be the most recent one)
+        assert!(all_vts
+            .0
+            .windows(2)
+            .all(|pair| { pair[0].blockheight() >= pair[1].blockheight() }));
     }
 
     pub mod tex {
@@ -419,7 +432,7 @@ mod fast {
             let val_tranfers = dbg!(sender.value_transfers().await);
             // This fails, as we don't scan sends to tex correctly yet
             assert_eq!(
-                val_tranfers.0[2].recipient_address().unwrap(),
+                val_tranfers.0[0].recipient_address().unwrap(),
                 tex_addr_from_first.encode()
             );
         }

zingolib/src/lightclient/describe.rs

@@ -271,7 +271,6 @@ impl LightClient {
     pub async fn messages_containing(&self, filter: Option<&str>) -> ValueTransfers {
         let mut value_transfers = self.value_transfers().await.0;
         value_transfers.reverse();
-
         match filter {
             Some(s) => {
                 value_transfers.retain(|vt| {
@@ -303,7 +302,7 @@ impl LightClient {
         let mut value_transfers: Vec<ValueTransfer> = Vec::new();
         let transaction_summaries = self.transaction_summaries().await;
 
-        for tx in transaction_summaries.iter() {
+        for tx in transaction_summaries.iter().rev() {
             match tx.kind() {
                 TransactionKind::Sent(SendType::Send) => {
                     // create 1 sent value transfer for each non-self recipient address

zingolib/src/testutils/chain_generics/fixtures.rs

@@ -57,21 +57,22 @@ where
         false,
     )
     .await;
+
     assert_eq!(sender.value_transfers().await.0.len(), 3);
     assert_eq!(
         sender.value_transfers().await.0[0].kind(),
-        ValueTransferKind::Received
-    );
-    assert_eq!(
-        sender.value_transfers().await.0[1].kind(),
         ValueTransferKind::Sent(SentValueTransfer::Send)
     );
     assert_eq!(
-        sender.value_transfers().await.0[2].kind(),
+        sender.value_transfers().await.0[1].kind(),
         ValueTransferKind::Sent(SentValueTransfer::SendToSelf(
             SelfSendValueTransfer::MemoToSelf
         ))
     );
+    assert_eq!(
+        sender.value_transfers().await.0[2].kind(),
+        ValueTransferKind::Received
+    );
     assert_eq!(recipient.value_transfers().await.0.len(), 1);
     assert_eq!(
         recipient.value_transfers().await.0[0].kind(),
@@ -85,9 +86,10 @@ where
         false,
     )
     .await;
+
     assert_eq!(sender.value_transfers().await.0.len(), 4);
     assert_eq!(
-        sender.value_transfers().await.0[3].kind(),
+        sender.value_transfers().await.0[0].kind(),
         ValueTransferKind::Sent(SentValueTransfer::SendToSelf(SelfSendValueTransfer::Basic))
     );
 
@@ -96,7 +98,7 @@ where
         .unwrap();
     assert_eq!(sender.value_transfers().await.0.len(), 5);
     assert_eq!(
-        sender.value_transfers().await.0[4].kind(),
+        sender.value_transfers().await.0[0].kind(),
         ValueTransferKind::Sent(SentValueTransfer::SendToSelf(SelfSendValueTransfer::Shield))
     );
 }