diff --git a/services/rfq/contracts/fastbridge/status.go b/services/rfq/contracts/fastbridge/status.go index 1a8b9605fc..82867f471d 100644 --- a/services/rfq/contracts/fastbridge/status.go +++ b/services/rfq/contracts/fastbridge/status.go @@ -25,6 +25,8 @@ func (b BridgeStatus) Int() uint8 { } // set all contact types. +// +//nolint:gosec,intrange func init() { for i := 0; i < len(_BridgeStatus_index)-1; i++ { contractType := BridgeStatus(i) diff --git a/services/rfq/contracts/fastbridgev2/generate.go b/services/rfq/contracts/fastbridgev2/generate.go index 752d9897fe..5b3b63cdbf 100644 --- a/services/rfq/contracts/fastbridgev2/generate.go +++ b/services/rfq/contracts/fastbridgev2/generate.go @@ -1,3 +1,4 @@ +// Package fastbridgev2 is the fast bridge v2 contract. package fastbridgev2 //go:generate go run github.com/synapsecns/sanguine/tools/abigen generate --sol ../../../../packages/contracts-rfq/flattened/FastBridgeV2.sol --pkg fastbridgev2 --sol-version 0.8.24 --filename fastbridgev2 --evm-version istanbul diff --git a/services/rfq/contracts/fastbridgev2/parser.go b/services/rfq/contracts/fastbridgev2/parser.go index 15a662b4b9..c6e5fd429d 100644 --- a/services/rfq/contracts/fastbridgev2/parser.go +++ b/services/rfq/contracts/fastbridgev2/parser.go @@ -91,7 +91,6 @@ func (p parserImpl) ParseEvent(log ethTypes.Log) (_ EventType, event interface{} return noOpEvent, nil, false } return eventType, disputed, true - } return eventType, nil, true diff --git a/services/rfq/contracts/fastbridgev2/status.go b/services/rfq/contracts/fastbridgev2/status.go index fa285fb77d..0b19532aae 100644 --- a/services/rfq/contracts/fastbridgev2/status.go +++ b/services/rfq/contracts/fastbridgev2/status.go @@ -25,6 +25,8 @@ func (b BridgeStatus) Int() uint8 { } // set all contact types. +// +//nolint:gosec,intrange func init() { for i := 0; i < len(_BridgeStatus_index)-1; i++ { contractType := BridgeStatus(i) diff --git a/services/rfq/contracts/testcontracts/fastbridgemockv2/generate.go b/services/rfq/contracts/testcontracts/fastbridgemockv2/generate.go index aab3d2f5d2..54040d842e 100644 --- a/services/rfq/contracts/testcontracts/fastbridgemockv2/generate.go +++ b/services/rfq/contracts/testcontracts/fastbridgemockv2/generate.go @@ -1,3 +1,4 @@ +// Package fastbridgemockv2 is a mock fast bridge contract for testing fast bridge interactions. package fastbridgemockv2 //go:generate go run github.com/synapsecns/sanguine/tools/abigen generate --sol ../../../../../packages/contracts-rfq/flattened/FastBridgeMock.sol --pkg fastbridgemockv2 --sol-version 0.8.20 --filename fastbridgemockv2 --evm-version istanbul diff --git a/services/rfq/contracts/testcontracts/recipientmock/generate.go b/services/rfq/contracts/testcontracts/recipientmock/generate.go index 5ab34dea53..fd7bb1fed8 100644 --- a/services/rfq/contracts/testcontracts/recipientmock/generate.go +++ b/services/rfq/contracts/testcontracts/recipientmock/generate.go @@ -1,3 +1,4 @@ +// Package recipientmock is a mock recipient contract for testing fast bridge interactions. package recipientmock //go:generate go run github.com/synapsecns/sanguine/tools/abigen generate --sol ../../../../../packages/contracts-rfq/flattened/RecipientMock.sol --pkg recipientmock --sol-version 0.8.20 --filename recipientmock --evm-version istanbul diff --git a/services/rfq/e2e/rfq_test.go b/services/rfq/e2e/rfq_test.go index 76d5d33eac..c5a777079f 100644 --- a/services/rfq/e2e/rfq_test.go +++ b/services/rfq/e2e/rfq_test.go @@ -393,6 +393,7 @@ func (i *IntegrationSuite) TestETHtoETH() { }) } +//nolint:gosec func (i *IntegrationSuite) TestArbitraryCall() { // start the relayer and guard go func() { @@ -501,7 +502,6 @@ func (i *IntegrationSuite) TestArbitraryCall() { i.NoError(err) } } - }() i.Eventually(func() bool { diff --git a/services/rfq/relayer/reldb/base/model.go b/services/rfq/relayer/reldb/base/model.go index 1ae4a38ec8..465bac64e2 100644 --- a/services/rfq/relayer/reldb/base/model.go +++ b/services/rfq/relayer/reldb/base/model.go @@ -123,6 +123,8 @@ type Rebalance struct { // FromQuoteRequest converts a quote request to an object that can be stored in the db. // TODO: add validation for deadline > uint64 // TODO: roundtripper test. +// +//nolint:gosec func FromQuoteRequest(request reldb.QuoteRequest) RequestForQuote { return RequestForQuote{ TransactionID: hexutil.Encode(request.TransactionID[:]), diff --git a/services/rfq/relayer/service/handlers.go b/services/rfq/relayer/service/handlers.go index f309106a99..23ffb8eeea 100644 --- a/services/rfq/relayer/service/handlers.go +++ b/services/rfq/relayer/service/handlers.go @@ -32,6 +32,8 @@ var ( // This is the first event emitted in the bridge process. It is emitted when a user calls bridge on chain. // To process it, we decode the bridge transaction and store all the data, marking it as seen. // This marks the event as seen. +// +//nolint:cyclop func (r *Relayer) handleBridgeRequestedLog(parentCtx context.Context, req *fastbridgev2.FastBridgeV2BridgeRequested, chainID uint64) (err error) { ctx, span := r.metrics.Tracer().Start(parentCtx, "handleBridgeRequestedLog", trace.WithAttributes( attribute.String("transaction_id", hexutil.Encode(req.TransactionId[:])), diff --git a/services/rfq/relayer/service/suite_test.go b/services/rfq/relayer/service/suite_test.go index b172c08d28..f46d2f54d5 100644 --- a/services/rfq/relayer/service/suite_test.go +++ b/services/rfq/relayer/service/suite_test.go @@ -109,6 +109,7 @@ func (r *RelayerTestSuite) TestStore() { DestAmount: big.NewInt(2), Deadline: big.NewInt(3), }) + r.NoError(err) r.originBackend.WaitForConfirmation(r.GetTestContext(), tx) r.T().Skip("TODO, test storage") @@ -146,6 +147,7 @@ func (r *RelayerTestSuite) TestCommit() { DestAmount: big.NewInt(2), Deadline: big.NewInt(3), }) + r.NoError(err) r.originBackend.WaitForConfirmation(r.GetTestContext(), tx) r.T().Skip("TODO, test storage") diff --git a/services/rfq/testutil/contracttype.go b/services/rfq/testutil/contracttype.go index 1080d34896..dd163fb789 100644 --- a/services/rfq/testutil/contracttype.go +++ b/services/rfq/testutil/contracttype.go @@ -53,10 +53,10 @@ const ( FastBridgeType contractTypeImpl = iota + 1 // FastBridge // MockERC20Type is a mock erc20 contract. MockERC20Type // MockERC20 - // FastBridgeMockType is a mock contract for testing fast bridge interactions - // TODO: rename contract to MockFastBridge. + // FastBridgeMockType is a mock contract for testing fast bridge interactions. + // TODO: rename contract to MockFastBridge. FastBridgeMockType // FastBridgeMock - // RecipientMockType is a mock contract for testing fast bridge interactions + // RecipientMockType is a mock contract for testing fast bridge interactions. RecipientMockType // RecipientMock // WETH9Type is the weth 9 contract. WETH9Type // WETH9 diff --git a/services/rfq/testutil/typecast.go b/services/rfq/testutil/typecast.go index 0e6a99fb92..1c4b14269f 100644 --- a/services/rfq/testutil/typecast.go +++ b/services/rfq/testutil/typecast.go @@ -37,7 +37,7 @@ func (d *DeployManager) GetMockFastBridge(ctx context.Context, backend backends. return manager.GetContract[*fastbridgemockv2.FastBridgeMockRef](ctx, d.T(), d, backend, FastBridgeMockType) } -// GetMockRecipient gets the mock recipient. +// GetRecipientMock gets the mock recipient. func (d *DeployManager) GetRecipientMock(ctx context.Context, backend backends.SimulatedTestBackend) (contract contracts.DeployedContract, handle *recipientmock.RecipientMockRef) { d.T().Helper()