move + rename test receivers

smartcontractkit · Jan 29, 2025 · e3fc245 · e3fc245
1 parent 771fb99
commit e3fc245
Show file tree

Hide file tree

Showing 28 changed files with 48 additions and 48 deletions.
diff --git a/chains/solana/contracts/Cargo.lock b/chains/solana/contracts/Cargo.lock
diff --git a/...programs/ccip-invalid-receiver/Cargo.toml → ...ams/test-ccip-invalid-receiver/Cargo.toml b/...programs/ccip-invalid-receiver/Cargo.toml → ...ams/test-ccip-invalid-receiver/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "ccip_invalid_receiver"
+name = "test_ccip_invalid_receiver"
 version = "0.0.0-dev"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "ccip_invalid_receiver"
+name = "test_ccip_invalid_receiver"
 
 [features]
 no-entrypoint = []

diff --git a/...programs/ccip-invalid-receiver/Xargo.toml → ...ams/test-ccip-invalid-receiver/Xargo.toml b/...programs/ccip-invalid-receiver/Xargo.toml → ...ams/test-ccip-invalid-receiver/Xargo.toml
diff --git a/...programs/ccip-invalid-receiver/src/lib.rs → ...ams/test-ccip-invalid-receiver/src/lib.rs b/...programs/ccip-invalid-receiver/src/lib.rs → ...ams/test-ccip-invalid-receiver/src/lib.rs
@@ -7,7 +7,7 @@ use anchor_lang::prelude::*;
 declare_id!("9Vjda3WU2gsJgE4VdU6QuDw8rfHLyigfFyWs3XDPNUn8");
 
 #[program]
-pub mod ccip_invalid_receiver {
+pub mod test_ccip_invalid_receiver {
     use super::*;
 
     pub fn ccip_receive(ctx: Context<Initialize>, _message: Any2SVMMessage) -> Result<()> {

diff --git a/...ntracts/programs/ccip-receiver/Cargo.toml → ...ts/programs/test-ccip-receiver/Cargo.toml b/...ntracts/programs/ccip-receiver/Cargo.toml → ...ts/programs/test-ccip-receiver/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "ccip_receiver"
+name = "test_ccip_receiver"
 version = "0.1.0-dev"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "ccip_receiver"
+name = "test_ccip_receiver"
 
 [features]
 no-entrypoint = []

diff --git a/...ntracts/programs/ccip-receiver/Xargo.toml → ...ts/programs/test-ccip-receiver/Xargo.toml b/...ntracts/programs/ccip-receiver/Xargo.toml → ...ts/programs/test-ccip-receiver/Xargo.toml
diff --git a/...ntracts/programs/ccip-receiver/src/lib.rs → ...ts/programs/test-ccip-receiver/src/lib.rs b/...ntracts/programs/ccip-receiver/src/lib.rs → ...ts/programs/test-ccip-receiver/src/lib.rs
@@ -8,7 +8,7 @@ pub const EXTERNAL_EXECUTION_CONFIG_SEED: &[u8] = b"external_execution_config";
 /// This program an example of a CCIP Receiver Program.
 /// Used to test CCIP Router execute.
 #[program]
-pub mod ccip_receiver {
+pub mod test_ccip_receiver {
     use solana_program::{instruction::Instruction, program::invoke_signed};
 
     use super::*;

diff --git a/...cts/target/idl/ccip_invalid_receiver.json → ...arget/idl/test_ccip_invalid_receiver.json b/...cts/target/idl/ccip_invalid_receiver.json → ...arget/idl/test_ccip_invalid_receiver.json
@@ -1,6 +1,6 @@
 {
   "version": "0.0.0-dev",
-  "name": "ccip_invalid_receiver",
+  "name": "test_ccip_invalid_receiver",
   "instructions": [
     {
       "name": "ccipReceive",

diff --git a/...a/contracts/target/idl/ccip_receiver.json → ...tracts/target/idl/test_ccip_receiver.json b/...a/contracts/target/idl/ccip_receiver.json → ...tracts/target/idl/test_ccip_receiver.json
@@ -1,6 +1,6 @@
 {
   "version": "0.1.0-dev",
-  "name": "ccip_receiver",
+  "name": "test_ccip_receiver",
   "docs": [
     "This program an example of a CCIP Receiver Program.",
     "Used to test CCIP Router execute."

diff --git a/chains/solana/contracts/tests/ccip/ccip_router_test.go b/chains/solana/contracts/tests/ccip/ccip_router_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/contracts/tests/config"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/contracts/tests/testutils"
-	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/ccip_receiver"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/ccip_router"
+	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/test_ccip_receiver"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/token_pool"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/ccip"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/common"
@@ -35,7 +35,7 @@ func TestCCIPRouter(t *testing.T) {
 	t.Parallel()
 
 	ccip_router.SetProgramID(config.CcipRouterProgram)
-	ccip_receiver.SetProgramID(config.CcipLogicReceiver)
+	test_ccip_receiver.SetProgramID(config.CcipLogicReceiver)
 	token_pool.SetProgramID(config.CcipTokenPoolProgram)
 
 	ctx := tests.Context(t)
@@ -154,7 +154,7 @@ func TestCCIPRouter(t *testing.T) {
 		})
 
 		t.Run("receiver", func(t *testing.T) {
-			instruction, ixErr := ccip_receiver.NewInitializeInstruction(
+			instruction, ixErr := test_ccip_receiver.NewInitializeInstruction(
 				config.ReceiverTargetAccountPDA,
 				config.ReceiverExternalExecutionConfigPDA,
 				user.PublicKey(),
@@ -5379,7 +5379,7 @@ func TestCCIPRouter(t *testing.T) {
 						solana.SysVarInstructionsPubkey,
 					).ValidateAndBuild()
 					require.NoError(t, err)
-					tx := testutils.SendAndConfirm(ctx, t, solanaGoClient, []solana.Instruction{instruction}, transmitter, config.DefaultCommitment)
+					tx := testutils.SendAndConfirm(ctx, t, solanaGoClient, []solana.Instruction{instruction}, transmitter, config.DefaultCommitment, common.AddComputeUnitLimit(300_000))
 					event := ccip.EventCommitReportAccepted{}
 					require.NoError(t, common.ParseEvent(tx.Meta.LogMessages, "CommitReportAccepted", &event, config.PrintEvents))
 

diff --git a/...ings/ccip_invalid_receiver/CcipReceive.go → ...test_ccip_invalid_receiver/CcipReceive.go b/...ings/ccip_invalid_receiver/CcipReceive.go → ...test_ccip_invalid_receiver/CcipReceive.go
diff --git a/...ccip_invalid_receiver/CcipReceive_test.go → ...ccip_invalid_receiver/CcipReceive_test.go b/...ccip_invalid_receiver/CcipReceive_test.go → ...ccip_invalid_receiver/CcipReceive_test.go
diff --git a/...indings/ccip_invalid_receiver/accounts.go → ...gs/test_ccip_invalid_receiver/accounts.go b/...indings/ccip_invalid_receiver/accounts.go → ...gs/test_ccip_invalid_receiver/accounts.go
diff --git a/...ngs/ccip_invalid_receiver/instructions.go → ...est_ccip_invalid_receiver/instructions.go b/...ngs/ccip_invalid_receiver/instructions.go → ...est_ccip_invalid_receiver/instructions.go
diff --git a/...gs/ccip_invalid_receiver/testing_utils.go → ...st_ccip_invalid_receiver/testing_utils.go b/...gs/ccip_invalid_receiver/testing_utils.go → ...st_ccip_invalid_receiver/testing_utils.go
diff --git a/...gobindings/ccip_invalid_receiver/types.go → ...dings/test_ccip_invalid_receiver/types.go b/...gobindings/ccip_invalid_receiver/types.go → ...dings/test_ccip_invalid_receiver/types.go
diff --git a/...a/gobindings/ccip_receiver/CcipReceive.go → ...indings/test_ccip_receiver/CcipReceive.go b/...a/gobindings/ccip_receiver/CcipReceive.go → ...indings/test_ccip_receiver/CcipReceive.go
diff --git a/...indings/ccip_receiver/CcipReceive_test.go → ...gs/test_ccip_receiver/CcipReceive_test.go b/...indings/ccip_receiver/CcipReceive_test.go → ...gs/test_ccip_receiver/CcipReceive_test.go
diff --git a/...ndings/ccip_receiver/CcipTokenLockBurn.go → ...s/test_ccip_receiver/CcipTokenLockBurn.go b/...ndings/ccip_receiver/CcipTokenLockBurn.go → ...s/test_ccip_receiver/CcipTokenLockBurn.go
diff --git a/...s/ccip_receiver/CcipTokenLockBurn_test.go → ...t_ccip_receiver/CcipTokenLockBurn_test.go b/...s/ccip_receiver/CcipTokenLockBurn_test.go → ...t_ccip_receiver/CcipTokenLockBurn_test.go
diff --git a/...ngs/ccip_receiver/CcipTokenReleaseMint.go → ...est_ccip_receiver/CcipTokenReleaseMint.go b/...ngs/ccip_receiver/CcipTokenReleaseMint.go → ...est_ccip_receiver/CcipTokenReleaseMint.go
diff --git a/...cip_receiver/CcipTokenReleaseMint_test.go → ...cip_receiver/CcipTokenReleaseMint_test.go b/...cip_receiver/CcipTokenReleaseMint_test.go → ...cip_receiver/CcipTokenReleaseMint_test.go
diff --git a/...na/gobindings/ccip_receiver/Initialize.go → ...bindings/test_ccip_receiver/Initialize.go b/...na/gobindings/ccip_receiver/Initialize.go → ...bindings/test_ccip_receiver/Initialize.go
diff --git a/...bindings/ccip_receiver/Initialize_test.go → ...ngs/test_ccip_receiver/Initialize_test.go b/...bindings/ccip_receiver/Initialize_test.go → ...ngs/test_ccip_receiver/Initialize_test.go
diff --git a/...lana/gobindings/ccip_receiver/accounts.go → ...gobindings/test_ccip_receiver/accounts.go b/...lana/gobindings/ccip_receiver/accounts.go → ...gobindings/test_ccip_receiver/accounts.go
diff --git a/.../gobindings/ccip_receiver/instructions.go → ...ndings/test_ccip_receiver/instructions.go b/.../gobindings/ccip_receiver/instructions.go → ...ndings/test_ccip_receiver/instructions.go
diff --git a/...gobindings/ccip_receiver/testing_utils.go → ...dings/test_ccip_receiver/testing_utils.go b/...gobindings/ccip_receiver/testing_utils.go → ...dings/test_ccip_receiver/testing_utils.go
diff --git a/.../solana/gobindings/ccip_receiver/types.go → ...na/gobindings/test_ccip_receiver/types.go b/.../solana/gobindings/ccip_receiver/types.go → ...na/gobindings/test_ccip_receiver/types.go