1 files changed, 8 insertions, 48 deletions

diff --git a/worker/swift/models.go b/worker/swift/models.go
index 4a318d0..f00265e 100644
--- a/worker/swift/models.go
+++ b/worker/swift/models.go
@@ -17,70 +17,30 @@ var (
 	errInvalidMaxDuration = errors.New("'max_duration_ms' must be positive")
 )
 
-type swiftCompileRequestData struct {
-	MaxDurationMilliseconds int    `json:"max_duration_ms"`
+type execRequestData struct {
 	Code                    string `json:"code"`
 	CodeHash                string `json:"code_hash"`
+	Stdin                   string `json:"stdin"`
+	MaxDurationMilliseconds int    `json:"max_duration_ms"`
 }
 
-func (req *swiftCompileRequestData) maxDuration() time.Duration {
+func (req *execRequestData) maxDuration() time.Duration {
 	return time.Duration(req.MaxDurationMilliseconds) * time.Millisecond
 }
 
-func (req *swiftCompileRequestData) validate() error {
+func (req *execRequestData) validate() error {
 	if req.MaxDurationMilliseconds <= 0 {
 		return errInvalidMaxDuration
 	}
 	return nil
 }
 
-type swiftCompileResponseData struct {
+type execResponseData struct {
 	Status string `json:"status"`
 	Stdout string `json:"stdout"`
 	Stderr string `json:"stderr"`
 }
 
-type wasmCompileRequestData struct {
-	MaxDurationMilliseconds int    `json:"max_duration_ms"`
-	CodeHash                string `json:"code_hash"`
-}
-
-type wasmCompileResponseData struct {
-	Status string `json:"status"`
-	Stdout string `json:"stdout"`
-	Stderr string `json:"stderr"`
-}
-
-func (req *wasmCompileRequestData) maxDuration() time.Duration {
-	return time.Duration(req.MaxDurationMilliseconds) * time.Millisecond
-}
-
-func (req *wasmCompileRequestData) validate() error {
-	if req.MaxDurationMilliseconds <= 0 {
-		return errInvalidMaxDuration
-	}
-	return nil
-}
-
-type testRunRequestData struct {
-	MaxDurationMilliseconds int    `json:"max_duration_ms"`
-	CodeHash                string `json:"code_hash"`
-	Stdin                   string `json:"stdin"`
-}
-
-func (req *testRunRequestData) maxDuration() time.Duration {
-	return time.Duration(req.MaxDurationMilliseconds) * time.Millisecond
-}
-
-func (req *testRunRequestData) validate() error {
-	if req.MaxDurationMilliseconds <= 0 {
-		return errInvalidMaxDuration
-	}
-	return nil
-}
-
-type testRunResponseData struct {
-	Status string `json:"status"`
-	Stdout string `json:"stdout"`
-	Stderr string `json:"stderr"`
+func (res *execResponseData) success() bool {
+	return res.Status == resultSuccess
 }