chore(prt-rollups): move rollups tests to prt/test/rollups

prt/tests/compute/blockchain/utils.lua

@@ -19,9 +19,9 @@ local function advance_time(seconds, endpoint)
     end
 end
 
-local deploy_cmd = [[sh -c "cd ../../contracts && ./deploy_anvil.sh"]]
-local function deploy_contracts()
-    local reader = io.popen(deploy_cmd)
+local deploy_cmd = [[sh -c "cd %s && ./deploy_anvil.sh"]]
+local function deploy_contracts(contracts_path)
+    local reader = io.popen(string.format(deploy_cmd, contracts_path))
     assert(reader, "Failed to open process for deploy command: " .. deploy_cmd)
     local output = reader:read("*a")
     local success = reader:close()

prt/tests/compute/prt_compute.lua

@@ -147,7 +147,7 @@ local root_tournament = blockchain_constants.root_tournament
 local blockchain_node = Blockchain:new()
 time.sleep(NODE_DELAY)
 
-blockchain_utils.deploy_contracts()
+blockchain_utils.deploy_contracts("../../contracts")
 time.sleep(NODE_DELAY)
 
 local player_coroutines = setup_players(use_lua_node, extra_data, root_tournament, machine_path)

cartesi-rollups/tests/rollups/Dockerfile → prt/tests/rollups/Dockerfile

@@ -50,17 +50,17 @@ RUN curl -sSL https://github.com/foundry-rs/foundry/releases/download/${FOUNDRY_
 
 # prepare echo machine
 WORKDIR /root/program/
-COPY ./cartesi-rollups/tests/rollups/program/echo/echo-program.tar.gz /root/program/
+COPY ./prt/tests/rollups/program/echo/echo-program.tar.gz /root/program/
 RUN tar -zx -f /root/program/echo-program.tar.gz
 
 COPY ./machine/step /root/machine/step
 COPY ./prt /root/prt
 COPY ./cartesi-rollups /root/cartesi-rollups
-COPY --from=builder /app/cartesi-rollups/node/target/release/dave-rollups /root/cartesi-rollups/tests/rollups/dave-rollups
+COPY --from=builder /app/cartesi-rollups/node/target/release/dave-rollups /root/prt/tests/rollups/dave-rollups
 
 WORKDIR /root/cartesi-rollups/contracts
 RUN forge --version
 RUN forge build
 
-WORKDIR /root/cartesi-rollups/tests/rollups
+WORKDIR /root/prt/tests/rollups
 ENTRYPOINT ["./prt_rollups.lua"]

cartesi-rollups/tests/rollups/Makefile → prt/tests/rollups/Makefile

@@ -2,7 +2,7 @@ ECHO_MACHINE_PATH := "/root/program/echo-program"
 
 help:
 	@echo '  create-image              - create `prt-rollups:test` docker image'
-	@echo '  test-echo                 - run PRT echo test'
+	@echo '  test-echo                 - run PRT rollups echo test'
 
 create-image:
 	@docker build -t cartesi/prt-rollups:test -f Dockerfile ../../../

cartesi-rollups/tests/rollups/prt_rollups.lua → prt/tests/rollups/prt_rollups.lua

@@ -10,7 +10,7 @@ local EPOCH_TIME = 60 * 60 * 24 * 7
 -- delay time for blockchain node to be ready
 local NODE_DELAY = 3
 -- number of fake commitment to make
-local FAKE_COMMITMENT_COUNT = 1
+local FAKE_COMMITMENT_COUNT = 2
 -- number of idle players
 local IDLE_PLAYER_COUNT = 0
 -- consensus contract address in anvil deployment
@@ -188,7 +188,7 @@ local rollups_machine_path = os.getenv("MACHINE_PATH")
 local blockchain_node = Blockchain:new()
 time.sleep(NODE_DELAY)
 
-blockchain_utils.deploy_contracts()
+blockchain_utils.deploy_contracts("../../../cartesi-rollups/contracts")
 time.sleep(NODE_DELAY)
 
 local dave_node = Dave:new(rollups_machine_path)

cartesi-rollups/tests/rollups/setup_path.lua → prt/tests/rollups/setup_path.lua

@@ -1,6 +1,6 @@
 -- setup client-lua path
-package.path = package.path .. ";../../../prt/client-lua/?.lua"
-package.path = package.path .. ";../../../prt/tests/compute/?.lua"
+package.path = package.path .. ";../compute/?.lua"
+package.path = package.path .. ";../../client-lua/?.lua"
 
 -- setup cartesi machine path
 package.path = package.path .. ";/opt/cartesi/lib/lua/5.4/?.lua"