From 58457b11f912d37c11524991a30c624e369c3fbd Mon Sep 17 00:00:00 2001
From: Peter Argue <89119817+peterargue@users.noreply.github.com>
Date: Fri, 27 Dec 2024 12:40:05 -0800
Subject: [PATCH 1/2] [CI] Split access cohort3 tests into 2 groups

---
 .github/workflows/ci.yml                                    | 3 +++
 integration/Makefile                                        | 6 +++++-
 .../{cohort3 => cohort4}/access_circuit_breaker_test.go     | 4 ++--
 .../access_store_tx_error_messages_test.go                  | 2 +-
 .../access/{cohort3 => cohort4}/grpc_compression_test.go    | 2 +-
 .../access/{cohort3 => cohort4}/grpc_state_stream_test.go   | 2 +-
 .../{cohort3 => cohort4}/grpc_streaming_blocks_test.go      | 2 +-
 .../access/{cohort3 => cohort4}/rest_state_stream_test.go   | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)
 rename integration/tests/access/{cohort3 => cohort4}/access_circuit_breaker_test.go (98%)
 rename integration/tests/access/{cohort3 => cohort4}/access_store_tx_error_messages_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/grpc_compression_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/grpc_state_stream_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/grpc_streaming_blocks_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/rest_state_stream_test.go (99%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43191c05933..16e4606d5e2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -336,6 +336,9 @@ jobs:
           - name: Access Cohort3 Integration Tests
             make: make -C integration access-cohort3-tests
             runner: ubuntu-latest
+          - name: Access Cohort4 Integration Tests
+            make: make -C integration access-cohort4-tests
+            runner: ubuntu-latest
             # test suite has single test which is flaky and needs to be fixed - reminder here to put it back when it's fixed
 #          - name: BFT (Framework) Integration Tests
 #            make: make -C integration bft-framework-tests
diff --git a/integration/Makefile b/integration/Makefile
index 4893e0cc9ff..cd90e705fb2 100644
--- a/integration/Makefile
+++ b/integration/Makefile
@@ -23,7 +23,7 @@ test:
 	CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) $(GO_TEST_PACKAGES)
 
 .PHONY: access-tests
-access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests
+access-tests: access-cohort1-tests access-cohort2-tests access-cohort3-tests access-cohort4-tests
 
 .PHONY: access-cohort1-tests
 access-cohort1-tests:
@@ -37,6 +37,10 @@ access-cohort2-tests:
 access-cohort3-tests:
 	CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/access/cohort3/...
 
+.PHONY: access-cohort4-tests
+access-cohort4-tests:
+	CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/access/cohort4/...
+
 .PHONY: collection-tests
 collection-tests:
 	CGO_CFLAGS=$(CRYPTO_FLAG) go test -failfast $(if $(VERBOSE),-v,) $(RACE_FLAG) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) ./tests/collection/...
diff --git a/integration/tests/access/cohort3/access_circuit_breaker_test.go b/integration/tests/access/cohort4/access_circuit_breaker_test.go
similarity index 98%
rename from integration/tests/access/cohort3/access_circuit_breaker_test.go
rename to integration/tests/access/cohort4/access_circuit_breaker_test.go
index 8cb745bd569..a0cd33ed509 100644
--- a/integration/tests/access/cohort3/access_circuit_breaker_test.go
+++ b/integration/tests/access/cohort4/access_circuit_breaker_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"
@@ -169,7 +169,7 @@ func (s *AccessCircuitBreakerSuite) TestCircuitBreaker() {
 	// Try to send the transaction for the second time. It should wait less than a second because the circuit breaker
 	// is configured to break after the first failure
 	err = accessClient.SendTransaction(s.ctx, signedTx)
-	//Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
+	// Here we catch the codes.Unknown error, as this is the one that comes from the Circuit Breaker when the state is Open.
 	assert.Equal(s.T(), codes.Unknown, status.Code(err))
 
 	// Reconnect the collection node
diff --git a/integration/tests/access/cohort3/access_store_tx_error_messages_test.go b/integration/tests/access/cohort4/access_store_tx_error_messages_test.go
similarity index 99%
rename from integration/tests/access/cohort3/access_store_tx_error_messages_test.go
rename to integration/tests/access/cohort4/access_store_tx_error_messages_test.go
index 19809e853db..596a436684d 100644
--- a/integration/tests/access/cohort3/access_store_tx_error_messages_test.go
+++ b/integration/tests/access/cohort4/access_store_tx_error_messages_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"
diff --git a/integration/tests/access/cohort3/grpc_compression_test.go b/integration/tests/access/cohort4/grpc_compression_test.go
similarity index 99%
rename from integration/tests/access/cohort3/grpc_compression_test.go
rename to integration/tests/access/cohort4/grpc_compression_test.go
index 1f8f0de59c0..807262350dd 100644
--- a/integration/tests/access/cohort3/grpc_compression_test.go
+++ b/integration/tests/access/cohort4/grpc_compression_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"
diff --git a/integration/tests/access/cohort3/grpc_state_stream_test.go b/integration/tests/access/cohort4/grpc_state_stream_test.go
similarity index 99%
rename from integration/tests/access/cohort3/grpc_state_stream_test.go
rename to integration/tests/access/cohort4/grpc_state_stream_test.go
index 2f2d883bb1e..0becfe6e659 100644
--- a/integration/tests/access/cohort3/grpc_state_stream_test.go
+++ b/integration/tests/access/cohort4/grpc_state_stream_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"bytes"
diff --git a/integration/tests/access/cohort3/grpc_streaming_blocks_test.go b/integration/tests/access/cohort4/grpc_streaming_blocks_test.go
similarity index 99%
rename from integration/tests/access/cohort3/grpc_streaming_blocks_test.go
rename to integration/tests/access/cohort4/grpc_streaming_blocks_test.go
index a41896e11db..ad7694c4ccd 100644
--- a/integration/tests/access/cohort3/grpc_streaming_blocks_test.go
+++ b/integration/tests/access/cohort4/grpc_streaming_blocks_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"
diff --git a/integration/tests/access/cohort3/rest_state_stream_test.go b/integration/tests/access/cohort4/rest_state_stream_test.go
similarity index 99%
rename from integration/tests/access/cohort3/rest_state_stream_test.go
rename to integration/tests/access/cohort4/rest_state_stream_test.go
index 4526c96e83e..7f8450ba633 100644
--- a/integration/tests/access/cohort3/rest_state_stream_test.go
+++ b/integration/tests/access/cohort4/rest_state_stream_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"

From e2bab50da4afcee3a2314780b38d744ed095b21a Mon Sep 17 00:00:00 2001
From: Peter Argue <89119817+peterargue@users.noreply.github.com>
Date: Fri, 27 Dec 2024 12:51:10 -0800
Subject: [PATCH 2/2] reorganize to fix linting

---
 .../access/{cohort4 => cohort3}/access_circuit_breaker_test.go  | 2 +-
 integration/tests/access/{cohort3 => cohort4}/access_test.go    | 2 +-
 .../access/{cohort3 => cohort4}/execution_data_pruning_test.go  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename integration/tests/access/{cohort4 => cohort3}/access_circuit_breaker_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/access_test.go (99%)
 rename integration/tests/access/{cohort3 => cohort4}/execution_data_pruning_test.go (99%)

diff --git a/integration/tests/access/cohort4/access_circuit_breaker_test.go b/integration/tests/access/cohort3/access_circuit_breaker_test.go
similarity index 99%
rename from integration/tests/access/cohort4/access_circuit_breaker_test.go
rename to integration/tests/access/cohort3/access_circuit_breaker_test.go
index a0cd33ed509..e172be9515d 100644
--- a/integration/tests/access/cohort4/access_circuit_breaker_test.go
+++ b/integration/tests/access/cohort3/access_circuit_breaker_test.go
@@ -1,4 +1,4 @@
-package cohort4
+package cohort3
 
 import (
 	"context"
diff --git a/integration/tests/access/cohort3/access_test.go b/integration/tests/access/cohort4/access_test.go
similarity index 99%
rename from integration/tests/access/cohort3/access_test.go
rename to integration/tests/access/cohort4/access_test.go
index 9b060b2c05c..22f2e9d4942 100644
--- a/integration/tests/access/cohort3/access_test.go
+++ b/integration/tests/access/cohort4/access_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"
diff --git a/integration/tests/access/cohort3/execution_data_pruning_test.go b/integration/tests/access/cohort4/execution_data_pruning_test.go
similarity index 99%
rename from integration/tests/access/cohort3/execution_data_pruning_test.go
rename to integration/tests/access/cohort4/execution_data_pruning_test.go
index 312ee60347c..b3b4205d8a5 100644
--- a/integration/tests/access/cohort3/execution_data_pruning_test.go
+++ b/integration/tests/access/cohort4/execution_data_pruning_test.go
@@ -1,4 +1,4 @@
-package cohort3
+package cohort4
 
 import (
 	"context"