clean up examples and go mod

smartcontractkit · Dec 15, 2023 · 335f71d · 335f71d
1 parent cba4fdf
commit 335f71d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 24 deletions.
diff --git a/examples/alerts/gun.go b/examples/alerts/gun.go
@@ -20,16 +20,16 @@ func NewExampleHTTPGun(target string) *ExampleGun {
 }
 
 // Call implements example gun call, assertions on response bodies should be done here
-func (m *ExampleGun) Call(l *wasp.Generator) *wasp.CallResult {
+func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response {
 	var result map[string]interface{}
 	r, err := m.client.R().
 		SetResult(&result).
 		Get(m.target)
 	if err != nil {
-		return &wasp.CallResult{Data: result, Error: err.Error()}
+		return &wasp.Response{Data: result, Error: err.Error()}
 	}
 	if r.Status() != "200 OK" {
-		return &wasp.CallResult{Data: result, Error: "not 200", Failed: true}
+		return &wasp.Response{Data: result, Error: "not 200", Failed: true}
 	}
-	return &wasp.CallResult{Data: result}
+	return &wasp.Response{Data: result}
 }
diff --git a/examples/cluster/gun.go b/examples/cluster/gun.go
@@ -20,16 +20,16 @@ func NewExampleHTTPGun(target string) *ExampleGun {
 }
 
 // Call implements example gun call, assertions on response bodies should be done here
-func (m *ExampleGun) Call(l *wasp.Generator) *wasp.CallResult {
+func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response {
 	var result map[string]interface{}
 	r, err := m.client.R().
 		SetResult(&result).
 		Get(m.target)
 	if err != nil {
-		return &wasp.CallResult{Data: result, Error: err.Error()}
+		return &wasp.Response{Data: result, Error: err.Error()}
 	}
 	if r.Status() != "200 OK" {
-		return &wasp.CallResult{Data: result, Error: "not 200", Failed: true}
+		return &wasp.Response{Data: result, Error: "not 200", Failed: true}
 	}
-	return &wasp.CallResult{Data: result}
+	return &wasp.Response{Data: result}
 }
diff --git a/examples/profiles/gun.go b/examples/profiles/gun.go
@@ -20,16 +20,16 @@ func NewExampleHTTPGun(target string) *ExampleGun {
 }
 
 // Call implements example gun call, assertions on response bodies should be done here
-func (m *ExampleGun) Call(l *wasp.Generator) *wasp.CallResult {
+func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response {
 	var result map[string]interface{}
 	r, err := m.client.R().
 		SetResult(&result).
 		Get(m.target)
 	if err != nil {
-		return &wasp.CallResult{Data: result, Error: err.Error()}
+		return &wasp.Response{Data: result, Error: err.Error()}
 	}
 	if r.Status() != "200 OK" {
-		return &wasp.CallResult{Data: result, Error: "not 200"}
+		return &wasp.Response{Data: result, Error: "not 200"}
 	}
-	return &wasp.CallResult{Data: result}
+	return &wasp.Response{Data: result}
 }
diff --git a/examples/profiles/vu.go b/examples/profiles/vu.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"fmt"
+
 	"github.com/smartcontractkit/wasp"
 	"nhooyr.io/websocket"
 	"nhooyr.io/websocket/wsjson"
@@ -56,10 +57,10 @@ func (m *WSVirtualUser) Call(l *wasp.Generator) {
 	err := wsjson.Read(context.Background(), m.conn, &v)
 	if err != nil {
 		l.Log.Error().Err(err).Msg("failed read ws msg from vu")
-		l.ResponsesChan <- &wasp.CallResult{StartedAt: &startedAt, Data: v, Error: fmt.Sprintf("read error: %s", err.Error())}
+		l.ResponsesChan <- &wasp.Response{StartedAt: &startedAt, Data: v, Error: fmt.Sprintf("read error: %s", err.Error())}
 		return
 	}
-	l.ResponsesChan <- &wasp.CallResult{StartedAt: &startedAt, Data: v}
+	l.ResponsesChan <- &wasp.Response{StartedAt: &startedAt, Data: v}
 }
 
 func (m *WSVirtualUser) Stop(_ *wasp.Generator) {

diff --git a/examples/simple_rps/gun.go b/examples/simple_rps/gun.go
@@ -20,16 +20,16 @@ func NewExampleHTTPGun(target string) *ExampleGun {
 }
 
 // Call implements example gun call, assertions on response bodies should be done here
-func (m *ExampleGun) Call(l *wasp.Generator) *wasp.CallResult {
+func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response {
 	var result map[string]interface{}
 	r, err := m.client.R().
 		SetResult(&result).
 		Get(m.target)
 	if err != nil {
-		return &wasp.CallResult{Data: result, Error: err.Error()}
+		return &wasp.Response{Data: result, Error: err.Error()}
 	}
 	if r.Status() != "200 OK" {
-		return &wasp.CallResult{Data: result, Error: "not 200"}
+		return &wasp.Response{Data: result, Error: "not 200"}
 	}
-	return &wasp.CallResult{Data: result}
+	return &wasp.Response{Data: result}
 }
diff --git a/examples/simple_vu/vu.go b/examples/simple_vu/vu.go
@@ -54,10 +54,10 @@ func (m *WSVirtualUser) Call(l *wasp.Generator) {
 	err := wsjson.Read(context.Background(), m.conn, &v)
 	if err != nil {
 		l.Log.Error().Err(err).Msg("failed read ws msg from vu")
-		l.ResponsesChan <- &wasp.CallResult{StartedAt: &startedAt, Error: err.Error(), Failed: true}
+		l.ResponsesChan <- &wasp.Response{StartedAt: &startedAt, Error: err.Error(), Failed: true}
 		return
 	}
-	l.ResponsesChan <- &wasp.CallResult{StartedAt: &startedAt, Data: v}
+	l.ResponsesChan <- &wasp.Response{StartedAt: &startedAt, Data: v}
 }
 
 func (m *WSVirtualUser) Stop(_ *wasp.Generator) {

diff --git a/go.mod b/go.mod
@@ -18,17 +18,13 @@ require (
 	github.com/rs/zerolog v1.29.0
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/ratelimit v0.2.0
-	// google.golang.org/grpc version 1.58.x and above are no longer compatible with loki at 990ac685e6a6
 	google.golang.org/grpc v1.59.0 // indirect
 	k8s.io/api v0.28.1
 	k8s.io/apimachinery v0.28.1
 	k8s.io/client-go v0.28.1
 	nhooyr.io/websocket v1.8.7
 )
 
-// required for loki v2.9.3
-// replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
-
 require (
 	github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
 	github.com/K-Phoen/sdk v0.12.2 // indirect