Merge branch 'master' into petera/split-access-cohort3-integration-tests

onflow · Dec 29, 2024 · 3953304 · 3953304
2 parents e2bab50 + 219660a
commit 3953304
Show file tree

Hide file tree

Showing 15 changed files with 1,087 additions and 468 deletions.
diff --git a/Makefile b/Makefile
@@ -216,7 +216,6 @@ generate-mocks: install-mock-generators
 	mockery --name 'Storage' --dir=module/executiondatasync/tracker --case=underscore --output="module/executiondatasync/tracker/mock" --outpkg="mocktracker"
 	mockery --name 'ScriptExecutor' --dir=module/execution --case=underscore --output="module/execution/mock" --outpkg="mock"
 	mockery --name 'StorageSnapshot' --dir=fvm/storage/snapshot --case=underscore --output="fvm/storage/snapshot/mock" --outpkg="mock"
-	mockery --name 'WebsocketConnection' --dir=engine/access/rest/websockets --case=underscore --output="engine/access/rest/websockets/mock" --outpkg="mock"
 
 	#temporarily make insecure/ a non-module to allow mockery to create mocks
 	mv insecure/go.mod insecure/go2.mod

diff --git a/engine/access/rest/websockets/config.go b/engine/access/rest/websockets/config.go
@@ -34,15 +34,11 @@ const (
 type Config struct {
 	MaxSubscriptionsPerConnection uint64
 	MaxResponsesPerSecond         uint64
-	SendMessageTimeout            time.Duration
-	MaxRequestSize                int64
 }
 
 func NewDefaultWebsocketConfig() Config {
 	return Config{
 		MaxSubscriptionsPerConnection: 1000,
 		MaxResponsesPerSecond:         1000,
-		SendMessageTimeout:            10 * time.Second,
-		MaxRequestSize:                1024,
 	}
 }