Skip to content

Commit

Permalink
fix: code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ecPablo committed Feb 19, 2025
1 parent 0c1438e commit f420a12
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
8 changes: 4 additions & 4 deletions deployment/common/changeset/example/solana_transfer_mcm.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ func (f TransferFromTimelock) VerifyPreconditions(e deployment.Environment, conf
if amountCfg.To.IsZero() {
return errors.New("destination address is empty")
}
addreses, err := e.ExistingAddresses.AddressesForChain(chainSelector)
addresses, err := e.ExistingAddresses.AddressesForChain(chainSelector)
if err != nil {
return fmt.Errorf("failed to get existing addresses: %w", err)
}
mcmState, err := state.MaybeLoadMCMSWithTimelockChainStateSolana(solChain, addreses)
mcmState, err := state.MaybeLoadMCMSWithTimelockChainStateSolana(solChain, addresses)
if err != nil {
return fmt.Errorf("failed to load MCMS state: %w", err)
}
Expand Down Expand Up @@ -117,15 +117,15 @@ func (f TransferFromTimelock) Apply(e deployment.Environment, config TransferFro
acc.IsSigner = false
}
}
solanTx, err := mcmssolanasdk.NewTransaction(
solanaTx, err := mcmssolanasdk.NewTransaction(
solana.SystemProgramID.String(),
data,
big.NewInt(0),
ix.Accounts(), "SystemProgram", []string{})
if err != nil {
return deployment.ChangesetOutput{}, fmt.Errorf("failed to create transaction: %w", err)
}
transactions = append(transactions, solanTx)
transactions = append(transactions, solanaTx)
}
batches = append(batches, types.BatchOperation{
ChainSelector: types.ChainSelector(chainSelector),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
func setupFundingTestEnv(t *testing.T) deployment.Environment {
lggr := logger.TestLogger(t)
cfg := memory.MemoryEnvironmentConfig{
Nodes: 1,
SolChains: 1,
}
env := memory.NewMemoryEnvironment(t, lggr, zapcore.DebugLevel, cfg)
Expand Down Expand Up @@ -59,6 +58,7 @@ func TestTransferFromTimelockConfig_VerifyPreconditions(t *testing.T) {
validEnv.SolChains[chainselectors.SOLANA_DEVNET.Selector] = deployment.SolChain{}
validSolChainSelector := validEnv.AllChainSelectorsSolana()[0]
receiverKey := solana.NewWallet().PublicKey()
cs := example.TransferFromTimelock{}
timelockID := mcmsSolana.ContractAddress(
solana.NewWallet().PublicKey(),
[32]byte{'t', 'e', 's', 't'},
Expand All @@ -72,9 +72,7 @@ func TestTransferFromTimelockConfig_VerifyPreconditions(t *testing.T) {
// Create an environment that simulates a chain where the MCMS contracts have not been deployed,
// e.g. missing the required addresses so that the state loader returns empty seeds.
noTimelockEnv := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
Chains: 0,
SolChains: 1,
Nodes: 1,
})
noTimelockEnv.SolChains[chainselectors.SOLANA_DEVNET.Selector] = deployment.SolChain{}
err = noTimelockEnv.ExistingAddresses.Save(chainselectors.SOLANA_DEVNET.Selector, "dummy", deployment.TypeAndVersion{
Expand All @@ -85,9 +83,7 @@ func TestTransferFromTimelockConfig_VerifyPreconditions(t *testing.T) {

// Create an environment with a Solana chain that has an invalid (zero) underlying chain.
invalidSolChainEnv := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
Chains: 0,
SolChains: 0,
Nodes: 1,
})
invalidSolChainEnv.SolChains[validSolChainSelector] = deployment.SolChain{}

Expand Down Expand Up @@ -194,10 +190,7 @@ func TestTransferFromTimelockConfig_VerifyPreconditions(t *testing.T) {
},
}

cs := example.TransferFromTimelock{}

for _, tt := range tests {
tt := tt // capture range variable
t.Run(tt.name, func(t *testing.T) {
err := cs.VerifyPreconditions(tt.env, tt.config)
if tt.expectedError == "" {
Expand Down

0 comments on commit f420a12

Please sign in to comment.