american english spelling adopted

Author: Bengt Lofgren

solana/modules/matching-engine-testing/tests/README.md

@@ -10,7 +10,7 @@ Each test is a function that is annotated with `#[tokio::test]`.
 
 Each test is a test for a specific scenario, and uses the `TestingEngine` to execute a series of instruction triggers.
 
-The `TestingEngine` is initialised with a `TestingContext`. The `TestingContext` holds the solana program test context, the actors, the transfer direction, created vaas, as well as some constants.
+The `TestingEngine` is initialized with a `TestingContext`. The `TestingContext` holds the solana program test context, the actors, the transfer direction, created vaas, as well as some constants.
 
 The `TestingEngine` is used to execute the instruction triggers in the order they are provided. See the `testing_engine/engine.rs` file for more details.
 
@@ -19,7 +19,7 @@ The `TestingEngine` is used to execute the instruction triggers in the order the
 ### Initialize program
 
 What is expected:
-- Program is initialised
+- Program is initialized
 - Router endpoints are created
 
 
@@ -33,7 +33,7 @@ What is expected:
 What is expected:
 - Fast market order account is created
 - Guardian signatures account is created via Verify VAA Shim program, which are the signatures found in the fast market order VAA from the source network.
-- Fast market order is initialised
+- Fast market order is initialized
 
 ### Close fast market order
 
@@ -44,7 +44,7 @@ What is expected:
 ### Place initial offer (shim)
 
 What is expected:
-- Fast market order is initialised
+- Fast market order is initialized
 - Initial offer is placed
 - Auction account is created and corresponds to a vaa and the initial offer
 

solana/modules/matching-engine-testing/tests/shimful/fast_market_order_shim.rs

@@ -8,10 +8,10 @@ use matching_engine::fallback::close_fast_market_order::{
     CloseFastMarketOrder as CloseFastMarketOrderFallback,
     CloseFastMarketOrderAccounts as CloseFastMarketOrderFallbackAccounts,
 };
-use matching_engine::fallback::initialise_fast_market_order::{
-    InitialiseFastMarketOrder as InitialiseFastMarketOrderFallback,
-    InitialiseFastMarketOrderAccounts as InitialiseFastMarketOrderFallbackAccounts,
-    InitialiseFastMarketOrderData as InitialiseFastMarketOrderFallbackData,
+use matching_engine::fallback::initialize_fast_market_order::{
+    InitializeFastMarketOrder as InitializeFastMarketOrderFallback,
+    InitializeFastMarketOrderAccounts as InitializeFastMarketOrderFallbackAccounts,
+    InitializeFastMarketOrderData as InitializeFastMarketOrderFallbackData,
 };
 use utils::constants::*;
 
@@ -21,9 +21,9 @@ use solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::Signer, transaction
 use std::rc::Rc;
 use wormhole_io::TypePrefixedPayload;
 
-/// Initialise the fast market order account
+/// Initialize the fast market order account
 ///
-/// This function initialises the fast market order account
+/// This function initializes the fast market order account
 ///
 /// # Arguments
 ///
@@ -38,7 +38,7 @@ use wormhole_io::TypePrefixedPayload;
 /// # Asserts
 ///
 /// * The expected error, if any, is reached when executing the instruction
-pub async fn initialise_fast_market_order_fallback(
+pub async fn initialize_fast_market_order_fallback(
     testing_context: &TestingContext,
     test_context: &mut ProgramTestContext,
     payer_signer: &Rc<Keypair>,
@@ -47,7 +47,7 @@ pub async fn initialise_fast_market_order_fallback(
     expected_error: Option<&ExpectedError>,
 ) {
     let program_id = &testing_context.get_matching_engine_program_id();
-    let initialise_fast_market_order_ix = initialise_fast_market_order_fallback_instruction(
+    let initialize_fast_market_order_ix = initialize_fast_market_order_fallback_instruction(
         payer_signer,
         program_id,
         fast_market_order,
@@ -56,7 +56,7 @@ pub async fn initialise_fast_market_order_fallback(
     let transaction = testing_context
         .create_transaction(
             test_context,
-            &[initialise_fast_market_order_ix],
+            &[initialize_fast_market_order_ix],
             Some(&payer_signer.pubkey()),
             &[payer_signer],
             1000000000,
@@ -68,9 +68,9 @@ pub async fn initialise_fast_market_order_fallback(
         .await;
 }
 
-/// Creates the initialise fast market order fallback instruction
+/// Creates the initialize fast market order fallback instruction
 ///
-/// This function creates the initialise fast market order fallback instruction
+/// This function creates the initialize fast market order fallback instruction
 ///
 /// # Arguments
 ///
@@ -83,8 +83,8 @@ pub async fn initialise_fast_market_order_fallback(
 ///
 /// # Returns
 ///
-/// * `Instruction` - The initialise fast market order fallback instruction
-fn initialise_fast_market_order_fallback_instruction(
+/// * `Instruction` - The initialize fast market order fallback instruction
+fn initialize_fast_market_order_fallback_instruction(
     payer_signer: &Rc<Keypair>,
     program_id: &Pubkey,
     fast_market_order: FastMarketOrderState,
@@ -100,7 +100,7 @@ fn initialise_fast_market_order_fallback_instruction(
     )
     .0;
 
-    let create_fast_market_order_accounts = InitialiseFastMarketOrderFallbackAccounts {
+    let create_fast_market_order_accounts = InitializeFastMarketOrderFallbackAccounts {
         signer: &payer_signer.pubkey(),
         fast_market_order_account: &fast_market_order_account,
         guardian_set: &guardian_signature_info.guardian_set_pubkey,
@@ -109,10 +109,10 @@ fn initialise_fast_market_order_fallback_instruction(
         system_program: &solana_program::system_program::ID,
     };
 
-    InitialiseFastMarketOrderFallback {
+    InitializeFastMarketOrderFallback {
         program_id,
         accounts: create_fast_market_order_accounts,
-        data: InitialiseFastMarketOrderFallbackData::new(
+        data: InitializeFastMarketOrderFallbackData::new(
             fast_market_order,
             guardian_signature_info.guardian_set_bump,
         ),

solana/modules/matching-engine-testing/tests/test_scenarios/create_and_close_fast_market_order.rs

@@ -6,13 +6,13 @@
 //!
 //! ### Happy path tests
 //!
-//! - `test_initialise_fast_market_order_fallback` - Test that the fast market order is initialised correctly
+//! - `test_initialize_fast_market_order_fallback` - Test that the fast market order is initialized correctly
 //! - `test_close_fast_market_order_fallback` - Test that the fast market order is closed correctly
 //! - `test_close_fast_market_order_fallback_with_custom_refund_recipient` - Test that the fast market order is closed correctly with a custom refund recipient
 //!
 //! ### Sad path tests
 //!
-//! - `test_fast_market_order_cannot_be_refunded_by_someone_who_did_not_initialise_it` - Test that the fast market order cannot be refunded by someone who did not initialise it
+//! - `test_fast_market_order_cannot_be_refunded_by_someone_who_did_not_initialize_it` - Test that the fast market order cannot be refunded by someone who did not initialize it
 //!
 //! ### Edge case tests
 //!
@@ -55,7 +55,7 @@ use utils::vaa::VaaArgs;
 
 /// Test that the create fast market order account works correctly for the fallback instruction
 #[tokio::test]
-pub async fn test_initialise_fast_market_order_fallback() {
+pub async fn test_initialize_fast_market_order_fallback() {
     let vaa_args = vec![VaaArgs {
         post_vaa: false,
         ..VaaArgs::default()
@@ -175,9 +175,9 @@ pub async fn test_close_fast_market_order_fallback_with_custom_refund_recipient(
                     *****************
 */
 
-/// Test that the fast market order cannot be refunded by someone who did not initialise it
+/// Test that the fast market order cannot be refunded by someone who did not initialize it
 #[tokio::test]
-pub async fn test_fast_market_order_cannot_be_refunded_by_someone_who_did_not_initialise_it() {
+pub async fn test_fast_market_order_cannot_be_refunded_by_someone_who_did_not_initialize_it() {
     let transfer_direction = TransferDirection::FromArbitrumToEthereum;
     let vaa_args = vec![VaaArgs {
         post_vaa: false,

solana/modules/matching-engine-testing/tests/test_scenarios/execute_order.rs

@@ -1044,7 +1044,7 @@ pub async fn test_execute_order_shim_emitter_chain_mismatch() {
     )
     .await;
     let testing_engine = TestingEngine::new(testing_context).await;
-    let initialise_first_fast_market_order_instruction_triggers = vec![
+    let initialize_first_fast_market_order_instruction_triggers = vec![
         InstructionTrigger::InitializeProgram(InitializeInstructionConfig::default()),
         InstructionTrigger::CreateCctpRouterEndpoints(
             CreateCctpRouterEndpointsInstructionConfig::default(),
@@ -1053,14 +1053,14 @@ pub async fn test_execute_order_shim_emitter_chain_mismatch() {
             InitializeFastMarketOrderShimInstructionConfig::default(),
         ),
     ];
-    let initialise_first_fast_market_order_state = testing_engine
+    let initialize_first_fast_market_order_state = testing_engine
         .execute(
             &mut test_context,
-            initialise_first_fast_market_order_instruction_triggers,
+            initialize_first_fast_market_order_instruction_triggers,
             None,
         )
         .await;
-    let initialise_second_fast_market_order_instruction_triggers = vec![
+    let initialize_second_fast_market_order_instruction_triggers = vec![
         InstructionTrigger::PlaceInitialOfferShim(PlaceInitialOfferInstructionConfig::default()),
         InstructionTrigger::InitializeFastMarketOrderShim(
             InitializeFastMarketOrderShimInstructionConfig {
@@ -1070,11 +1070,11 @@ pub async fn test_execute_order_shim_emitter_chain_mismatch() {
             },
         ),
     ];
-    let initialise_second_fast_market_order_state = testing_engine
+    let initialize_second_fast_market_order_state = testing_engine
         .execute(
             &mut test_context,
-            initialise_second_fast_market_order_instruction_triggers,
-            Some(initialise_first_fast_market_order_state),
+            initialize_second_fast_market_order_instruction_triggers,
+            Some(initialize_first_fast_market_order_state),
         )
         .await;
     let instruction_triggers = vec![InstructionTrigger::ExecuteOrderShim(
@@ -1092,7 +1092,7 @@ pub async fn test_execute_order_shim_emitter_chain_mismatch() {
         .execute(
             &mut test_context,
             instruction_triggers,
-            Some(initialise_second_fast_market_order_state),
+            Some(initialize_second_fast_market_order_state),
         )
         .await;
 }

solana/modules/matching-engine-testing/tests/test_scenarios/initialise_and_misc.rs

@@ -1,12 +1,12 @@
-//! # Initialise and misc instruction testing
+//! # Initialize and misc instruction testing
 //!
-//! This module contains tests for the initialise and some other miscellaneous setup test scenarios.
+//! This module contains tests for the initialize and some other miscellaneous setup test scenarios.
 //!
 //! ## Test Cases
 //!
 //! ### Happy path tests
 //!
-//! - `test_initialize_program` - Test that the program is initialised correctly
+//! - `test_initialize_program` - Test that the program is initialized correctly
 //! - `test_cctp_token_router_endpoint_creation` - Test that a CCTP token router endpoint is created for the arbitrum and ethereum chains
 //! - `test_local_token_router_endpoint_creation` - Test that a local token router endpoint is created for the arbitrum and ethereum chains
 //! - `test_setup_vaas` - Test that the vaas are setup correctly
@@ -61,7 +61,7 @@ use wormhole_svm_definitions::solana::CORE_BRIDGE_PROGRAM_ID;
                     *****************
 */
 
-/// Test that the program is initialised correctly
+/// Test that the program is initialized correctly
 #[tokio::test]
 pub async fn test_initialize_program() {
     let (testing_context, mut test_context) = setup_environment(

solana/modules/matching-engine-testing/tests/test_scenarios/mod.rs

@@ -1,6 +1,6 @@
 pub mod create_and_close_fast_market_order;
 pub mod execute_order;
-pub mod initialise_and_misc;
+pub mod initialize_and_misc;
 pub mod make_offer;
 pub mod prepare_order;
 pub mod settle_auction;

solana/modules/matching-engine-testing/tests/testing_engine/engine.rs

@@ -33,7 +33,7 @@ use super::setup::TestingContext;
 use super::{config::*, state::*};
 use crate::shimful;
 use crate::shimful::fast_market_order_shim::{
-    create_fast_market_order_state_from_vaa_data, initialise_fast_market_order_fallback,
+    create_fast_market_order_state_from_vaa_data, initialize_fast_market_order_fallback,
 };
 use crate::shimful::verify_shim::create_guardian_signatures;
 use crate::shimless;
@@ -502,7 +502,7 @@ impl TestingEngine {
             &self.testing_context.get_matching_engine_program_id(),
         );
 
-        initialise_fast_market_order_fallback(
+        initialize_fast_market_order_fallback(
             &self.testing_context,
             test_context,
             &payer_signer,

solana/modules/matching-engine-testing/tests/testing_engine/setup.rs

@@ -18,9 +18,9 @@ use crate::utils::airdrop::{airdrop, airdrop_spl_token};
 use crate::utils::cctp_message::CctpRemoteTokenMessenger;
 use crate::utils::mint::MintFixture;
 use crate::utils::program_fixtures::{
-    initialise_cctp_message_transmitter, initialise_cctp_token_messenger_minter,
-    initialise_local_token_router, initialise_post_message_shims, initialise_upgrade_manager,
-    initialise_verify_shims, initialise_wormhole_core_bridge,
+    initialize_cctp_message_transmitter, initialize_cctp_token_messenger_minter,
+    initialize_local_token_router, initialize_post_message_shims, initialize_upgrade_manager,
+    initialize_verify_shims, initialize_wormhole_core_bridge,
 };
 use crate::utils::token_account::{
     create_token_account, read_keypair_from_file, SplTokenEnum, TokenAccountFixture,
@@ -113,26 +113,26 @@ impl PreTestingContext {
         // Setup Testing Actors
         let testing_actors = TestingActors::new(owner_keypair_path);
         println!("Testing actors: {:?}", testing_actors);
-        // Initialise Upgrade Manager
-        let program_data_pubkey = initialise_upgrade_manager(
+        // Initialize Upgrade Manager
+        let program_data_pubkey = initialize_upgrade_manager(
             &mut program_test,
             &program_id,
             testing_actors.owner.pubkey(),
         );
 
-        // Initialise CCTP Token Messenger Minter
-        initialise_cctp_token_messenger_minter(&mut program_test);
+        // Initialize CCTP Token Messenger Minter
+        initialize_cctp_token_messenger_minter(&mut program_test);
 
-        // Initialise Wormhole Core Bridge
-        initialise_wormhole_core_bridge(&mut program_test);
+        // Initialize Wormhole Core Bridge
+        initialize_wormhole_core_bridge(&mut program_test);
 
-        // Initialise CCTP Message Transmitter
-        initialise_cctp_message_transmitter(&mut program_test);
+        // Initialize CCTP Message Transmitter
+        initialize_cctp_message_transmitter(&mut program_test);
 
-        // Initialise Local Token Router
-        initialise_local_token_router(&mut program_test);
+        // Initialize Local Token Router
+        initialize_local_token_router(&mut program_test);
 
-        // Initialise Account Fixtures
+        // Initialize Account Fixtures
         let account_fixtures = FixtureAccounts::new(&mut program_test);
 
         // Add lookup table accounts
@@ -148,12 +148,12 @@ impl PreTestingContext {
 
     /// Adds the post message shims to the program test
     pub fn add_post_message_shims(&mut self) {
-        initialise_post_message_shims(&mut self.program_test);
+        initialize_post_message_shims(&mut self.program_test);
     }
 
     /// Adds the verify shims to the program test
     pub fn add_verify_shims(&mut self) {
-        initialise_verify_shims(&mut self.program_test);
+        initialize_verify_shims(&mut self.program_test);
     }
 }
 

solana/modules/matching-engine-testing/tests/utils/account_fixtures.rs

@@ -34,7 +34,7 @@ pub struct FixtureAccounts {
 }
 
 impl FixtureAccounts {
-    /// Initialises all accounts in fixtures directory
+    /// Initializes all accounts in fixtures directory
     ///
     /// # Arguments
     ///