Skip to content

Commit 47bbabf

Browse files
nvsriramnonergodic
nvsriram
and
nonergodic
authored
CI: Fix EVM and Solana Cargo SBF CI (#501)
* chore: fix fmt after forge formatter changed preferences * solana: Limit to 2 jobs for cargo build/test * solana: Reduce jobs to 1 * solana: Try switching to dedicated runner --------- Co-authored-by: nonergodic <nonergodic@gmail.com>
1 parent e80827c commit 47bbabf

15 files changed

+153
-208
lines changed

‎.github/workflows/solana.yml

+45-45
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ on:
88
- dev
99

1010
defaults:
11-
run:
12-
working-directory: ./solana
11+
run:
12+
working-directory: ./solana
1313

1414
jobs:
1515
solana-sbf:
1616
name: Solana Cargo SBF
17-
runs-on: ubuntu-20.04
17+
runs-on: tilt-kube-public
1818
env:
1919
RUSTFLAGS: -Dwarnings
2020

@@ -87,50 +87,50 @@ jobs:
8787
name: Check version
8888
runs-on: ubuntu-latest
8989
steps:
90-
- uses: actions/checkout@v4
91-
- run: ./scripts/sync-versions --check
92-
shell: bash
90+
- uses: actions/checkout@v4
91+
- run: ./scripts/sync-versions --check
92+
shell: bash
9393

9494
anchor-test:
9595
name: Anchor Test
9696
runs-on: ubuntu-latest
9797
steps:
98-
- uses: actions/checkout@v4
99-
- uses: metadaoproject/setup-anchor@v2
100-
with:
101-
node-version: '20.11.0'
102-
solana-cli-version: '1.18.10'
103-
anchor-version: '0.29.0'
104-
- name: Cache node_modules
105-
uses: actions/cache@v3
106-
with:
107-
path: ./solana/node_modules/
108-
key: node-modules-${{ runner.os }}-build-${{ inputs.node-version }}
109-
- name: Install node_modules
110-
run: make node_modules
111-
shell: bash
112-
- name: Create keypair
113-
run: solana-keygen new --no-bip39-passphrase
114-
shell: bash
115-
- name: Make Anchor.toml compatible with runner
116-
run: sed -i 's:/user/:/runner/:' Anchor.toml
117-
shell: bash
118-
- name: Install Cargo toolchain
119-
uses: actions-rs/toolchain@v1
120-
with:
121-
toolchain: stable
122-
profile: minimal
123-
components: rustc
124-
- name: Cache Cargo dependencies
125-
uses: Swatinem/rust-cache@v2
126-
with:
127-
workspaces: "solana"
128-
- name: Setup SDK
129-
run: make sdk
130-
shell: bash
131-
- name: Check idl
132-
run: |
133-
git diff --exit-code ts/idl
134-
- name: Run tests
135-
run: anchor test --skip-build
136-
shell: bash
98+
- uses: actions/checkout@v4
99+
- uses: metadaoproject/setup-anchor@v2
100+
with:
101+
node-version: "20.11.0"
102+
solana-cli-version: "1.18.10"
103+
anchor-version: "0.29.0"
104+
- name: Cache node_modules
105+
uses: actions/cache@v3
106+
with:
107+
path: ./solana/node_modules/
108+
key: node-modules-${{ runner.os }}-build-${{ inputs.node-version }}
109+
- name: Install node_modules
110+
run: make node_modules
111+
shell: bash
112+
- name: Create keypair
113+
run: solana-keygen new --no-bip39-passphrase
114+
shell: bash
115+
- name: Make Anchor.toml compatible with runner
116+
run: sed -i 's:/user/:/runner/:' Anchor.toml
117+
shell: bash
118+
- name: Install Cargo toolchain
119+
uses: actions-rs/toolchain@v1
120+
with:
121+
toolchain: stable
122+
profile: minimal
123+
components: rustc
124+
- name: Cache Cargo dependencies
125+
uses: Swatinem/rust-cache@v2
126+
with:
127+
workspaces: "solana"
128+
- name: Setup SDK
129+
run: make sdk
130+
shell: bash
131+
- name: Check idl
132+
run: |
133+
git diff --exit-code ts/idl
134+
- name: Run tests
135+
run: anchor test --skip-build
136+
shell: bash

‎evm/script/helpers/ParseNttConfig.sol

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ contract ParseNttConfig is Script {
3131
}
3232
}
3333

34-
function fromUniversalAddress(bytes32 universalAddr)
35-
internal
36-
pure
37-
returns (address converted)
38-
{
34+
function fromUniversalAddress(
35+
bytes32 universalAddr
36+
) internal pure returns (address converted) {
3937
require(bytes12(universalAddr) == 0, "Address overflow");
4038

4139
assembly ("memory-safe") {
4240
converted := universalAddr
4341
}
4442
}
4543

46-
function _parseAndValidateConfigFile(uint16 wormholeChainId)
44+
function _parseAndValidateConfigFile(
45+
uint16 wormholeChainId
46+
)
4747
internal
4848
returns (
4949
ChainConfig[] memory config,

‎evm/src/NttManager/NttManager.sol

+6-12
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,9 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
261261
}
262262

263263
/// @inheritdoc INttManager
264-
function completeOutboundQueuedTransfer(uint64 messageSequence)
265-
external
266-
payable
267-
nonReentrant
268-
whenNotPaused
269-
returns (uint64)
270-
{
264+
function completeOutboundQueuedTransfer(
265+
uint64 messageSequence
266+
) external payable nonReentrant whenNotPaused returns (uint64) {
271267
// find the message in the queue
272268
OutboundQueuedTransfer memory queuedTransfer = _getOutboundQueueStorage()[messageSequence];
273269
if (queuedTransfer.txTimestamp == 0) {
@@ -295,11 +291,9 @@ contract NttManager is INttManager, RateLimiter, ManagerBase {
295291
}
296292

297293
/// @inheritdoc INttManager
298-
function cancelOutboundQueuedTransfer(uint64 messageSequence)
299-
external
300-
nonReentrant
301-
whenNotPaused
302-
{
294+
function cancelOutboundQueuedTransfer(
295+
uint64 messageSequence
296+
) external nonReentrant whenNotPaused {
303297
// find the message in the queue
304298
OutboundQueuedTransfer memory queuedTransfer = _getOutboundQueueStorage()[messageSequence];
305299
if (queuedTransfer.txTimestamp == 0) {

‎evm/src/Transceiver/WormholeTransceiver/WormholeTransceiver.sol

+6-10
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,9 @@ contract WormholeTransceiver is
123123
}
124124

125125
/// @inheritdoc IWormholeTransceiver
126-
function parseWormholeTransceiverInstruction(bytes memory encoded)
127-
public
128-
pure
129-
returns (WormholeTransceiverInstruction memory instruction)
130-
{
126+
function parseWormholeTransceiverInstruction(
127+
bytes memory encoded
128+
) public pure returns (WormholeTransceiverInstruction memory instruction) {
131129
// If the user doesn't pass in any transceiver instructions then the default is false
132130
if (encoded.length == 0) {
133131
instruction.shouldSkipRelayerSend = false;
@@ -140,11 +138,9 @@ contract WormholeTransceiver is
140138
}
141139

142140
/// @inheritdoc IWormholeTransceiver
143-
function encodeWormholeTransceiverInstruction(WormholeTransceiverInstruction memory instruction)
144-
public
145-
pure
146-
returns (bytes memory)
147-
{
141+
function encodeWormholeTransceiverInstruction(
142+
WormholeTransceiverInstruction memory instruction
143+
) public pure returns (bytes memory) {
148144
return abi.encodePacked(instruction.shouldSkipRelayerSend);
149145
}
150146

‎evm/src/interfaces/INttManager.sol

+3-4
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,9 @@ interface INttManager is IManagerBase {
172172
/// @dev This method is called by the client to complete an outbound transfer that's been queued.
173173
/// @param queueSequence The sequence of the message in the queue.
174174
/// @return msgSequence The sequence of the message.
175-
function completeOutboundQueuedTransfer(uint64 queueSequence)
176-
external
177-
payable
178-
returns (uint64 msgSequence);
175+
function completeOutboundQueuedTransfer(
176+
uint64 queueSequence
177+
) external payable returns (uint64 msgSequence);
179178

180179
/// @notice Cancels an outbound transfer that's been queued.
181180
/// @dev This method is called by the client to cancel an outbound transfer that's been queued.

‎evm/src/interfaces/IRateLimiter.sol

+6-8
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,13 @@ interface IRateLimiter {
8686

8787
function getCurrentOutboundCapacity() external view returns (uint256);
8888

89-
function getOutboundQueuedTransfer(uint64 queueSequence)
90-
external
91-
view
92-
returns (OutboundQueuedTransfer memory);
89+
function getOutboundQueuedTransfer(
90+
uint64 queueSequence
91+
) external view returns (OutboundQueuedTransfer memory);
9392

9493
function getCurrentInboundCapacity(uint16 chainId) external view returns (uint256);
9594

96-
function getInboundQueuedTransfer(bytes32 digest)
97-
external
98-
view
99-
returns (InboundQueuedTransfer memory);
95+
function getInboundQueuedTransfer(
96+
bytes32 digest
97+
) external view returns (InboundQueuedTransfer memory);
10098
}

‎evm/src/interfaces/IWormholeTransceiver.sol

+6-8
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,14 @@ interface IWormholeTransceiver is IWormholeTransceiverState {
6666
/// This instruction is specific to the WormholeTransceiver contract.
6767
/// @param encoded The encoded instruction.
6868
/// @return instruction The parsed `WormholeTransceiverInstruction`.
69-
function parseWormholeTransceiverInstruction(bytes memory encoded)
70-
external
71-
pure
72-
returns (WormholeTransceiverInstruction memory instruction);
69+
function parseWormholeTransceiverInstruction(
70+
bytes memory encoded
71+
) external pure returns (WormholeTransceiverInstruction memory instruction);
7372

7473
/// @notice Encodes the `WormholeTransceiverInstruction` into a byte array.
7574
/// @param instruction The `WormholeTransceiverInstruction` to encode.
7675
/// @return encoded The encoded instruction.
77-
function encodeWormholeTransceiverInstruction(WormholeTransceiverInstruction memory instruction)
78-
external
79-
pure
80-
returns (bytes memory);
76+
function encodeWormholeTransceiverInstruction(
77+
WormholeTransceiverInstruction memory instruction
78+
) external pure returns (bytes memory);
8179
}

‎evm/src/libraries/RateLimiter.sol

+9-15
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,9 @@ abstract contract RateLimiter is IRateLimiter, IRateLimiterEvents {
107107
return trimmedCapacity.untrim(decimals);
108108
}
109109

110-
function getOutboundQueuedTransfer(uint64 queueSequence)
111-
public
112-
view
113-
returns (OutboundQueuedTransfer memory)
114-
{
110+
function getOutboundQueuedTransfer(
111+
uint64 queueSequence
112+
) public view returns (OutboundQueuedTransfer memory) {
115113
return _getOutboundQueueStorage()[queueSequence];
116114
}
117115

@@ -129,22 +127,18 @@ abstract contract RateLimiter is IRateLimiter, IRateLimiterEvents {
129127
return trimmedCapacity.untrim(decimals);
130128
}
131129

132-
function getInboundQueuedTransfer(bytes32 digest)
133-
public
134-
view
135-
returns (InboundQueuedTransfer memory)
136-
{
130+
function getInboundQueuedTransfer(
131+
bytes32 digest
132+
) public view returns (InboundQueuedTransfer memory) {
137133
return _getInboundQueueStorage()[digest];
138134
}
139135

140136
/**
141137
* @dev Gets the current capacity for a parameterized rate limits struct
142138
*/
143-
function _getCurrentCapacity(RateLimitParams memory rateLimitParams)
144-
internal
145-
view
146-
returns (TrimmedAmount capacity)
147-
{
139+
function _getCurrentCapacity(
140+
RateLimitParams memory rateLimitParams
141+
) internal view returns (TrimmedAmount capacity) {
148142
// If the rate limit duration is 0 then the rate limiter is skipped
149143
if (rateLimitDuration == 0) {
150144
return

0 commit comments

Comments
 (0)