chore: Fix merge issues

solana-labs · Mar 4, 2024 · 6d06deb · 6d06deb
1 parent 3c6fa1a
commit 6d06deb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/governance/program/src/instruction.rs b/governance/program/src/instruction.rs
@@ -1968,7 +1968,7 @@ pub fn set_token_owner_record_lock(
     Instruction {
         program_id: *program_id,
         accounts,
-        data: instruction.try_to_vec().unwrap(),
+        data: borsh::to_vec(&instruction).unwrap(),
     }
 }
 
@@ -2003,7 +2003,7 @@ pub fn relinquish_token_owner_record_locks(
     Instruction {
         program_id: *program_id,
         accounts,
-        data: instruction.try_to_vec().unwrap(),
+        data: borsh::to_vec(&instruction).unwrap(),
     }
 }
 
@@ -2032,6 +2032,6 @@ pub fn set_realm_config_item(
     Instruction {
         program_id: *program_id,
         accounts,
-        data: instruction.try_to_vec().unwrap(),
+        data: borsh::to_vec(&instruction).unwrap(),
     }
 }
diff --git a/governance/program/src/state/realm_config.rs b/governance/program/src/state/realm_config.rs
@@ -409,7 +409,7 @@ mod test {
             reserved: Reserved110::default(),
         };
 
-        let size = realm_config.try_to_vec().unwrap().len();
+        let size = borsh::to_vec(&realm_config).unwrap().len();
 
         assert_eq!(realm_config.get_max_size(), Some(size));
     }

diff --git a/governance/program/src/state/token_owner_record.rs b/governance/program/src/state/token_owner_record.rs
@@ -602,7 +602,7 @@ mod test {
         let token_owner_record = create_test_token_owner_record();
 
         // Act
-        let size = token_owner_record.try_to_vec().unwrap().len();
+        let size = borsh::to_vec(&token_owner_record).unwrap().len();
 
         // Assert
         assert_eq!(token_owner_record.get_max_size(), Some(size));
@@ -624,7 +624,7 @@ mod test {
         });
 
         // Act
-        let size = token_owner_record.try_to_vec().unwrap().len();
+        let size = borsh::to_vec(&token_owner_record).unwrap().len();
 
         // Assert
         assert_eq!(token_owner_record.get_max_size(), Some(size));