From 5b549fb59f11a376a67fc84b2741502a51ea91b9 Mon Sep 17 00:00:00 2001
From: microwavedcola1 <89031858+microwavedcola1@users.noreply.github.com>
Date: Mon, 3 Oct 2022 13:06:04 +0200
Subject: [PATCH] program: fix bug where expansion would not move positions
 whose size remained same (#262)

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
---
 programs/mango-v4/src/state/mango_account.rs | 37 +++++++++-----------
 programs/mango-v4/tests/test_basic.rs        | 24 ++++++++++++-
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/programs/mango-v4/src/state/mango_account.rs b/programs/mango-v4/src/state/mango_account.rs
index f16bacf2a..2a57970ea 100644
--- a/programs/mango-v4/src/state/mango_account.rs
+++ b/programs/mango-v4/src/state/mango_account.rs
@@ -974,7 +974,7 @@ impl<
         // expand dynamic components by first moving existing positions, and then setting new ones to defaults
 
         // perp oo
-        if new_header.perp_oo_count() > old_header.perp_oo_count() {
+        if old_header.perp_oo_count() > 0 {
             unsafe {
                 sol_memmove(
                     &mut dynamic[new_header.perp_oo_offset(0)],
@@ -982,14 +982,14 @@ impl<
                     size_of::<PerpOpenOrder>() * old_header.perp_oo_count(),
                 );
             }
-            for i in old_header.perp_oo_count..new_perp_oo_count {
-                *get_helper_mut(dynamic, new_header.perp_oo_offset(i.into())) =
-                    PerpOpenOrder::default();
-            }
+        }
+        for i in old_header.perp_oo_count..new_perp_oo_count {
+            *get_helper_mut(dynamic, new_header.perp_oo_offset(i.into())) =
+                PerpOpenOrder::default();
         }
 
         // perp positions
-        if new_header.perp_count() > old_header.perp_count() {
+        if old_header.perp_count() > 0 {
             unsafe {
                 sol_memmove(
                     &mut dynamic[new_header.perp_offset(0)],
@@ -997,14 +997,13 @@ impl<
                     size_of::<PerpPosition>() * old_header.perp_count(),
                 );
             }
-            for i in old_header.perp_count..new_perp_count {
-                *get_helper_mut(dynamic, new_header.perp_offset(i.into())) =
-                    PerpPosition::default();
-            }
+        }
+        for i in old_header.perp_count..new_perp_count {
+            *get_helper_mut(dynamic, new_header.perp_offset(i.into())) = PerpPosition::default();
         }
 
         // serum3 positions
-        if new_header.serum3_count() > old_header.serum3_count() {
+        if old_header.serum3_count() > 0 {
             unsafe {
                 sol_memmove(
                     &mut dynamic[new_header.serum3_offset(0)],
@@ -1012,14 +1011,13 @@ impl<
                     size_of::<Serum3Orders>() * old_header.serum3_count(),
                 );
             }
-            for i in old_header.serum3_count..new_serum3_count {
-                *get_helper_mut(dynamic, new_header.serum3_offset(i.into())) =
-                    Serum3Orders::default();
-            }
+        }
+        for i in old_header.serum3_count..new_serum3_count {
+            *get_helper_mut(dynamic, new_header.serum3_offset(i.into())) = Serum3Orders::default();
         }
 
         // token positions
-        if new_header.token_count() > old_header.token_count() {
+        if old_header.token_count() > 0 {
             unsafe {
                 sol_memmove(
                     &mut dynamic[new_header.token_offset(0)],
@@ -1027,10 +1025,9 @@ impl<
                     size_of::<TokenPosition>() * old_header.token_count(),
                 );
             }
-            for i in old_header.token_count..new_token_count {
-                *get_helper_mut(dynamic, new_header.token_offset(i.into())) =
-                    TokenPosition::default();
-            }
+        }
+        for i in old_header.token_count..new_token_count {
+            *get_helper_mut(dynamic, new_header.token_offset(i.into())) = TokenPosition::default();
         }
 
         // update the already-parsed header
diff --git a/programs/mango-v4/tests/test_basic.rs b/programs/mango-v4/tests/test_basic.rs
index 9a78bae97..0db9978f1 100644
--- a/programs/mango-v4/tests/test_basic.rs
+++ b/programs/mango-v4/tests/test_basic.rs
@@ -43,7 +43,7 @@ async fn test_basic() -> Result<(), TransportError> {
         AccountCreateInstruction {
             account_num: 0,
             token_count: 8,
-            serum3_count: 0,
+            serum3_count: 7,
             perp_count: 0,
             perp_oo_count: 0,
             group,
@@ -54,6 +54,17 @@ async fn test_basic() -> Result<(), TransportError> {
     .await
     .unwrap()
     .account;
+    let account_data: MangoAccount = solana.get_account(account).await;
+    assert_eq!(account_data.tokens.len(), 8);
+    assert_eq!(
+        account_data.tokens.iter().filter(|t| t.is_active()).count(),
+        0
+    );
+    assert_eq!(account_data.serum3.len(), 7);
+    assert_eq!(
+        account_data.serum3.iter().filter(|s| s.is_active()).count(),
+        0
+    );
 
     send_tx(
         solana,
@@ -71,6 +82,17 @@ async fn test_basic() -> Result<(), TransportError> {
     .await
     .unwrap()
     .account;
+    let account_data: MangoAccount = solana.get_account(account).await;
+    assert_eq!(account_data.tokens.len(), 16);
+    assert_eq!(
+        account_data.tokens.iter().filter(|t| t.is_active()).count(),
+        0
+    );
+    assert_eq!(account_data.serum3.len(), 8);
+    assert_eq!(
+        account_data.serum3.iter().filter(|s| s.is_active()).count(),
+        0
+    );
 
     //
     // TEST: Deposit funds