Skip to content

Commit f0d2e06

Browse files
RensRRensR
committed
Go fix
1 parent 873380f commit f0d2e06

26 files changed

Lines changed: 131 additions & 216 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,4 @@ devenv/env-out.toml
6464
operations-gen
6565
.agents/
6666
AGENTS.md
67+
/.gocache

‎chains/evm/deployment/fastcurse_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/Masterminds/semver/v3"
8-
"github.com/aws/smithy-go/ptr"
98
"github.com/ethereum/go-ethereum/common"
109
chainsel "github.com/smartcontractkit/chain-selectors"
1110
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"

‎chains/evm/deployment/hooks/post_proposal_ccip_send.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ func (e *EVMPostProposalCCIPSend) PreSendValidation(env cldf.Environment, srcSel
7474
// resolvable lane version from the source selector.
7575
func (e *EVMPostProposalCCIPSend) SupportedDestinations(env cldf.Environment, srcSel uint64) ([]uint64, error) {
7676
allDests, err := e.supportedRemoteChainsWithVersions(env, srcSel)
77-
if err != nil {
78-
return nil, err
79-
}
80-
return maps.Keys(allDests), nil
77+
return maps.Keys(allDests), err
8178
}
8279

8380
// AdapterVersionForLane returns the adapter version for the srcSel -> destSel lane.

‎chains/evm/deployment/utils/testhelpers/message_decoder_test.go‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/hex"
66
"fmt"
77
"math/big"
8+
"strings"
89
"testing"
910

1011
"github.com/ethereum/go-ethereum/common"
@@ -316,39 +317,40 @@ func DecodeTokenTransferV1(encoded []byte, offset int) (*TokenTransferV1, int, e
316317

317318
// PrettyPrintMessage formats a decoded message for readable output
318319
func PrettyPrintMessage(msg *MessageV1) string {
319-
s := "=== CCIP Message V1 ===\n\n"
320-
s += fmt.Sprintf(" Version: %d\n", msg.Version)
321-
s += fmt.Sprintf(" Source Chain Selector: %d (0x%x)\n", msg.SourceChainSelector, msg.SourceChainSelector)
322-
s += fmt.Sprintf(" Dest Chain Selector: %d (0x%x)\n", msg.DestChainSelector, msg.DestChainSelector)
323-
s += fmt.Sprintf(" Sequence Number: %d\n", msg.SequenceNumber)
324-
s += fmt.Sprintf(" Execution Gas Limit: %d\n", msg.ExecutionGasLimit)
325-
s += fmt.Sprintf(" Callback Gas Limit: %d\n", msg.CallbackGasLimit)
326-
s += fmt.Sprintf(" Finality: %d\n", msg.Finality)
327-
s += fmt.Sprintf(" CCV & Executor Hash: 0x%x\n", msg.CCVAndExecutorHash)
328-
s += fmt.Sprintf(" OnRamp Address: %s\n", formatAddress(msg.OnRampAddress))
329-
s += fmt.Sprintf(" OffRamp Address: %s\n", formatAddress(msg.OffRampAddress))
330-
s += "\n"
331-
s += fmt.Sprintf(" Sender: %s\n", formatAddress(msg.Sender))
332-
s += fmt.Sprintf(" Receiver: %s\n", formatAddress(msg.Receiver))
333-
s += fmt.Sprintf(" Dest Blob: %s (%d bytes)\n", formatHex(msg.DestBlob), len(msg.DestBlob))
334-
s += fmt.Sprintf(" Data Payload: %s (%d bytes)\n", formatHex(msg.Data), len(msg.Data))
335-
s += "\n"
336-
337-
s += fmt.Sprintf("Token Transfers: %d\n", len(msg.TokenTransfers))
320+
var s strings.Builder
321+
s.WriteString("=== CCIP Message V1 ===\n\n")
322+
s.WriteString(fmt.Sprintf(" Version: %d\n", msg.Version))
323+
s.WriteString(fmt.Sprintf(" Source Chain Selector: %d (0x%x)\n", msg.SourceChainSelector, msg.SourceChainSelector))
324+
s.WriteString(fmt.Sprintf(" Dest Chain Selector: %d (0x%x)\n", msg.DestChainSelector, msg.DestChainSelector))
325+
s.WriteString(fmt.Sprintf(" Sequence Number: %d\n", msg.SequenceNumber))
326+
s.WriteString(fmt.Sprintf(" Execution Gas Limit: %d\n", msg.ExecutionGasLimit))
327+
s.WriteString(fmt.Sprintf(" Callback Gas Limit: %d\n", msg.CallbackGasLimit))
328+
s.WriteString(fmt.Sprintf(" Finality: %d\n", msg.Finality))
329+
s.WriteString(fmt.Sprintf(" CCV & Executor Hash: 0x%x\n", msg.CCVAndExecutorHash))
330+
s.WriteString(fmt.Sprintf(" OnRamp Address: %s\n", formatAddress(msg.OnRampAddress)))
331+
s.WriteString(fmt.Sprintf(" OffRamp Address: %s\n", formatAddress(msg.OffRampAddress)))
332+
s.WriteString("\n")
333+
s.WriteString(fmt.Sprintf(" Sender: %s\n", formatAddress(msg.Sender)))
334+
s.WriteString(fmt.Sprintf(" Receiver: %s\n", formatAddress(msg.Receiver)))
335+
s.WriteString(fmt.Sprintf(" Dest Blob: %s (%d bytes)\n", formatHex(msg.DestBlob), len(msg.DestBlob)))
336+
s.WriteString(fmt.Sprintf(" Data Payload: %s (%d bytes)\n", formatHex(msg.Data), len(msg.Data)))
337+
s.WriteString("\n")
338+
339+
s.WriteString(fmt.Sprintf("Token Transfers: %d\n", len(msg.TokenTransfers)))
338340
for i, tt := range msg.TokenTransfers {
339-
s += fmt.Sprintf("\n Token Transfer #%d:\n", i+1)
340-
s += fmt.Sprintf(" Version: %d\n", tt.Version)
341-
s += fmt.Sprintf(" Amount: %s (wei)\n", tt.Amount.String())
342-
s += fmt.Sprintf(" Source Pool: %s\n", formatAddress(tt.SourcePoolAddress))
343-
s += fmt.Sprintf(" Source Token: %s\n", formatAddress(tt.SourceTokenAddress))
344-
s += fmt.Sprintf(" Dest Token: %s\n", formatAddress(tt.DestTokenAddress))
345-
s += fmt.Sprintf(" Token Receiver: %s\n", formatAddress(tt.TokenReceiver))
346-
s += fmt.Sprintf(" Extra Data: %s (%d bytes)\n", formatHex(tt.ExtraData), len(tt.ExtraData))
341+
s.WriteString(fmt.Sprintf("\n Token Transfer #%d:\n", i+1))
342+
s.WriteString(fmt.Sprintf(" Version: %d\n", tt.Version))
343+
s.WriteString(fmt.Sprintf(" Amount: %s (wei)\n", tt.Amount.String()))
344+
s.WriteString(fmt.Sprintf(" Source Pool: %s\n", formatAddress(tt.SourcePoolAddress)))
345+
s.WriteString(fmt.Sprintf(" Source Token: %s\n", formatAddress(tt.SourceTokenAddress)))
346+
s.WriteString(fmt.Sprintf(" Dest Token: %s\n", formatAddress(tt.DestTokenAddress)))
347+
s.WriteString(fmt.Sprintf(" Token Receiver: %s\n", formatAddress(tt.TokenReceiver)))
348+
s.WriteString(fmt.Sprintf(" Extra Data: %s (%d bytes)\n", formatHex(tt.ExtraData), len(tt.ExtraData)))
347349
}
348350

349-
s += "\n"
351+
s.WriteString("\n")
350352

351-
return s
353+
return s.String()
352354
}
353355

354356
// formatAddress formats a byte slice as an Ethereum address or hex string

‎chains/evm/deployment/v1_0_0/adapters/deployer_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ func TestDeployMCMS(t *testing.T) {
5050
Bypasser: testhelpers.SingleGroupMCMS(),
5151
Proposer: testhelpers.SingleGroupMCMS(),
5252
TimelockMinDelay: big.NewInt(0),
53-
Qualifier: ptr.String(utils.CLLQualifier),
53+
Qualifier: new(utils.CLLQualifier),
5454
},
5555
selector2: {
5656
Canceller: testhelpers.SingleGroupMCMS(),
5757
Bypasser: testhelpers.SingleGroupMCMS(),
5858
Proposer: testhelpers.SingleGroupMCMS(),
5959
TimelockMinDelay: big.NewInt(0),
60-
Qualifier: ptr.String(utils.CLLQualifier),
60+
Qualifier: new(utils.CLLQualifier),
6161
},
6262
},
6363
})

‎chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/Masterminds/semver/v3"
8-
"github.com/aws/smithy-go/ptr"
98
"github.com/ethereum/go-ethereum/accounts/abi/bind"
109
"github.com/ethereum/go-ethereum/common"
1110
chainsel "github.com/smartcontractkit/chain-selectors"

‎chains/evm/deployment/v1_0_0/transfer_ownership_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"testing"
66

77
"github.com/Masterminds/semver/v3"
8-
"github.com/aws/smithy-go/ptr"
98
"github.com/ethereum/go-ethereum/accounts/abi/bind"
109
"github.com/ethereum/go-ethereum/common"
1110
chainsel "github.com/smartcontractkit/chain-selectors"

‎chains/evm/deployment/v1_5_0/adapters/configimport.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ func GetSupportedTokensPerRemoteChain(ctx context.Context, l logger.Logger, toke
282282
if tokenAddr == (common.Address{}) {
283283
continue
284284
}
285-
tokenAddr := tokenAddr // capture loop variable
286285
grp.Go(func() error {
287286
poolAddr, err := tokenAdminRegC.GetPool(&bind.CallOpts{
288287
Context: grpCtx,

‎chains/evm/deployment/v1_5_0/sequences/onramp.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ var (
9494
}
9595
feeTokens := feetokenOut.Output
9696
for remoteChainSelector, onRampAddress := range input.OnRampsPerRemoteChain {
97-
remoteChainSelector := remoteChainSelector
98-
onRampAddress := onRampAddress
9997
outerGrp.Go(func() error {
10098
sCfgOut, err := operations.ExecuteOperation(b, onramp.OnRampStaticConfig, chain, contract.FunctionInput[any]{
10199
ChainSelector: chain.Selector,
@@ -135,7 +133,6 @@ var (
135133
tokenGrp, _ := errgroup.WithContext(b.GetContext())
136134
tokenGrp.SetLimit(10) // limit concurrency to avoid overwhelming the node with requests
137135
for _, token := range input.SupportedTokensPerChain[remoteChainSelector] {
138-
token := token
139136
tokenGrp.Go(func() error {
140137
ttfcOut, err := operations.ExecuteOperation(
141138
b, onramp.OnRampGetTokenTransferFeeConfig, chain, contract.FunctionInput[common.Address]{

‎chains/evm/deployment/v1_5_1/sequences/deploy_token_pool_test.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ func TestDeployTokenPool(t *testing.T) {
7676
name: "LockReleaseTokenPool_v1_5_1_accept_liquidity",
7777
poolType: lock_release_token_pool.ContractType,
7878
poolVersion: utils.Version_1_5_1,
79-
acceptLiquidity: boolPtr(true),
79+
acceptLiquidity: new(true),
8080
expectedTypeVersion: "LockReleaseTokenPool 1.5.1",
8181
},
8282
{
8383
name: "LockReleaseTokenPool_v1_5_1_no_liquidity",
8484
poolType: lock_release_token_pool.ContractType,
8585
poolVersion: utils.Version_1_5_1,
86-
acceptLiquidity: boolPtr(false),
86+
acceptLiquidity: new(false),
8787
expectedTypeVersion: "LockReleaseTokenPool 1.5.1",
8888
},
8989
}
@@ -198,7 +198,3 @@ func deployTestToken(t *testing.T, chain evm.Chain, symbol string, decimals uint
198198

199199
return tokenAddr
200200
}
201-
202-
func boolPtr(b bool) *bool {
203-
return &b
204-
}

0 commit comments

Comments
 (0)