Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/manual-sol-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
env:
DEPLOYMENT_KEY: ${{ github.ref == 'refs/heads/main' && secrets.PRIVATE_KEY || secrets.PRIVATE_KEY_DEV }}
DEPLOYMENT_KEY: ${{ secrets.PRIVATE_KEY }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/rainix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,30 @@ jobs:
fail-fast: false
runs-on: ${{ matrix.os }}
env:
DEPLOYMENT_KEY: ${{ github.ref == 'refs/heads/main' && secrets.PRIVATE_KEY || secrets.PRIVATE_KEY_DEV }}
DEPLOYMENT_KEY: ${{ secrets.PRIVATE_KEY }}
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v4
- uses: DeterminateSystems/magic-nix-cache-action@v2
- uses: nixbuild/nix-quick-install-action@v30
with:
nix_conf: |
keep-env-derivations = true
keep-outputs = true
- uses: cachix/cachix-action@v15
continue-on-error: true
with:
name: rainlanguage
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
useDaemon: false
- name: Restore and save Nix store
uses: nix-community/cache-nix-action@v6
with:
primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
restore-prefixes-first-match: nix-${{ runner.os }}-
gc-max-store-size-linux: 1G

- run: nix develop --command rainix-sol-prelude

Expand Down
6 changes: 4 additions & 2 deletions test/src/concrete/Flow.time.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ contract FlowTimeTest is FlowTest {
function testFlowBasicFlowTimeNoStoreSetWhenKvsEmpty() public {
(IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();

uint256[] memory stack = generateFlowStack(transferEmpty());
uint256[] memory stack =
LibStackGeneration.generateFlowStack(Sentinel.unwrap(RAIN_FLOW_SENTINEL), transferEmpty());
interpreterEval2MockCall(stack, new uint256[](0));

// Mock set to a no-op so the existing REVERTING_MOCK_BYTECODE on
Expand All @@ -56,7 +57,8 @@ contract FlowTimeTest is FlowTest {

(IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();

uint256[] memory stack = generateFlowStack(transferEmpty());
uint256[] memory stack =
LibStackGeneration.generateFlowStack(Sentinel.unwrap(RAIN_FLOW_SENTINEL), transferEmpty());
interpreterEval2MockCall(stack, writeToStore);

vm.mockCallRevert(address(STORE), abi.encodeWithSelector(IInterpreterStoreV2.set.selector), "STORE_SET_FAILED");
Expand Down
Loading