Fix conflicts

solana-labs · Jan 5, 2023 · 97aa4a2 · 97aa4a2
1 parent 91b636d
commit 97aa4a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/sdk/program/src/message/sanitized.rs b/sdk/program/src/message/sanitized.rs
@@ -113,7 +113,9 @@ impl SanitizedMessage {
         address_loader: impl AddressLoader,
     ) -> Result<Self, SanitizeMessageError> {
         Ok(match sanitized_msg.message {
-            VersionedMessage::Legacy(message) => SanitizedMessage::Legacy(message),
+            VersionedMessage::Legacy(message) => {
+                SanitizedMessage::Legacy(LegacyMessage::new(message))
+            }
             VersionedMessage::V0(message) => {
                 let loaded_addresses =
                     address_loader.load_addresses(&message.address_table_lookups)?;

diff --git a/sdk/src/transaction/sanitized.rs b/sdk/src/transaction/sanitized.rs
@@ -6,14 +6,9 @@ use {
     crate::{
         hash::Hash,
         message::{
-<<<<<<< HEAD
-            v0::{self, LoadedAddresses},
-            SanitizedMessage, VersionedMessage,
-=======
             legacy,
-            v0::{self, LoadedAddresses, MessageAddressTableLookup},
+            v0::{self, LoadedAddresses},
             LegacyMessage, SanitizedMessage, VersionedMessage,
->>>>>>> 5e71f339c (Add a SanitizedMessage type that caches writable accounts indexes (#27317))
         },
         precompiles::verify_if_precompile,
         pubkey::Pubkey,