Skip to content

Commit aefc288

Browse files
favalosfavalos
committed
Consolidated t_api Kind.
1 parent 538937b commit aefc288

File tree

13 files changed

+50
-233
lines changed

13 files changed

+50
-233
lines changed

‎cmd/dst/run.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ func RunDSTCmd() *cobra.Command {
110110
system.AddOnRequest(t_api.ReadPromise, coroutines.ReadPromise)
111111
system.AddOnRequest(t_api.SearchPromises, coroutines.SearchPromises)
112112
system.AddOnRequest(t_api.CreatePromise, coroutines.CreatePromise)
113-
system.AddOnRequest(t_api.CancelPromise, coroutines.CompletePromise)
114-
system.AddOnRequest(t_api.RejectPromise, coroutines.CompletePromise)
115-
system.AddOnRequest(t_api.ResolvePromise, coroutines.CompletePromise)
113+
system.AddOnRequest(t_api.CompletePromise, coroutines.CompletePromise)
116114
system.AddOnRequest(t_api.ReadSchedule, coroutines.ReadSchedule)
117115
system.AddOnRequest(t_api.SearchSchedules, coroutines.SearchSchedules)
118116
system.AddOnRequest(t_api.CreateSchedule, coroutines.CreateSchedule)
@@ -133,9 +131,7 @@ func RunDSTCmd() *cobra.Command {
133131
t_api.ReadPromise,
134132
t_api.SearchPromises,
135133
t_api.CreatePromise,
136-
t_api.CancelPromise,
137-
t_api.RejectPromise,
138-
t_api.ResolvePromise,
134+
t_api.CompletePromise,
139135

140136
// SCHEDULE
141137
t_api.ReadSchedule,

‎cmd/serve/serve.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ func ServeCmd() *cobra.Command {
8989
system.AddOnRequest(t_api.ReadPromise, coroutines.ReadPromise)
9090
system.AddOnRequest(t_api.SearchPromises, coroutines.SearchPromises)
9191
system.AddOnRequest(t_api.CreatePromise, coroutines.CreatePromise)
92-
system.AddOnRequest(t_api.CancelPromise, coroutines.CompletePromise)
93-
system.AddOnRequest(t_api.RejectPromise, coroutines.CompletePromise)
94-
system.AddOnRequest(t_api.ResolvePromise, coroutines.CompletePromise)
92+
system.AddOnRequest(t_api.CompletePromise, coroutines.CompletePromise)
9593
system.AddOnRequest(t_api.ReadSchedule, coroutines.ReadSchedule)
9694
system.AddOnRequest(t_api.SearchSchedules, coroutines.SearchSchedules)
9795
system.AddOnRequest(t_api.CreateSchedule, coroutines.CreateSchedule)

‎internal/api/api.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ func (a *api) Enqueue(sqe *bus.SQE[t_api.Request, t_api.Response]) {
9696
status = int(res.SearchPromises.Status)
9797
case t_api.CreatePromise:
9898
status = int(res.CreatePromise.Status)
99-
case t_api.CancelPromise:
100-
status = int(res.CompletePromise.Status)
101-
case t_api.RejectPromise:
102-
status = int(res.CompletePromise.Status)
103-
case t_api.ResolvePromise:
99+
case t_api.CompletePromise:
104100
status = int(res.CompletePromise.Status)
105101
case t_api.ReadSchedule:
106102
status = int(res.ReadSchedule.Status)

‎internal/app/subsystems/api/grpc/grpc_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ func TestCancelPromise(t *testing.T) {
544544
},
545545
},
546546
req: &t_api.Request{
547-
Kind: t_api.CancelPromise,
547+
Kind: t_api.CompletePromise,
548548
CompletePromise: &t_api.CompletePromiseRequest{
549549
Id: "foo",
550550
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -557,7 +557,7 @@ func TestCancelPromise(t *testing.T) {
557557
},
558558
},
559559
res: &t_api.Response{
560-
Kind: t_api.CancelPromise,
560+
Kind: t_api.CompletePromise,
561561
CompletePromise: &t_api.CompletePromiseResponse{
562562
Status: t_api.StatusCreated,
563563
Promise: &promise.Promise{
@@ -574,7 +574,7 @@ func TestCancelPromise(t *testing.T) {
574574
Id: "foo",
575575
},
576576
req: &t_api.Request{
577-
Kind: t_api.CancelPromise,
577+
Kind: t_api.CompletePromise,
578578
CompletePromise: &t_api.CompletePromiseRequest{
579579
Id: "foo",
580580
IdempotencyKey: nil,
@@ -587,7 +587,7 @@ func TestCancelPromise(t *testing.T) {
587587
},
588588
},
589589
res: &t_api.Response{
590-
Kind: t_api.CancelPromise,
590+
Kind: t_api.CompletePromise,
591591
CompletePromise: &t_api.CompletePromiseResponse{
592592
Status: t_api.StatusCreated,
593593
Promise: &promise.Promise{
@@ -604,7 +604,7 @@ func TestCancelPromise(t *testing.T) {
604604
Id: "foo",
605605
},
606606
req: &t_api.Request{
607-
Kind: t_api.CancelPromise,
607+
Kind: t_api.CompletePromise,
608608
CompletePromise: &t_api.CompletePromiseRequest{
609609
Id: "foo",
610610
IdempotencyKey: nil,
@@ -617,7 +617,7 @@ func TestCancelPromise(t *testing.T) {
617617
},
618618
},
619619
res: &t_api.Response{
620-
Kind: t_api.CancelPromise,
620+
Kind: t_api.CompletePromise,
621621
CompletePromise: &t_api.CompletePromiseResponse{
622622
Status: t_api.StatusPromiseAlreadyResolved,
623623
Promise: &promise.Promise{
@@ -687,7 +687,7 @@ func TestResolvePromise(t *testing.T) {
687687
},
688688
},
689689
req: &t_api.Request{
690-
Kind: t_api.ResolvePromise,
690+
Kind: t_api.CompletePromise,
691691
CompletePromise: &t_api.CompletePromiseRequest{
692692
Id: "foo",
693693
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -700,7 +700,7 @@ func TestResolvePromise(t *testing.T) {
700700
},
701701
},
702702
res: &t_api.Response{
703-
Kind: t_api.ResolvePromise,
703+
Kind: t_api.CompletePromise,
704704
CompletePromise: &t_api.CompletePromiseResponse{
705705
Status: t_api.StatusCreated,
706706
Promise: &promise.Promise{
@@ -717,7 +717,7 @@ func TestResolvePromise(t *testing.T) {
717717
Id: "foo",
718718
},
719719
req: &t_api.Request{
720-
Kind: t_api.ResolvePromise,
720+
Kind: t_api.CompletePromise,
721721
CompletePromise: &t_api.CompletePromiseRequest{
722722
Id: "foo",
723723
IdempotencyKey: nil,
@@ -730,7 +730,7 @@ func TestResolvePromise(t *testing.T) {
730730
},
731731
},
732732
res: &t_api.Response{
733-
Kind: t_api.ResolvePromise,
733+
Kind: t_api.CompletePromise,
734734
CompletePromise: &t_api.CompletePromiseResponse{
735735
Status: t_api.StatusCreated,
736736
Promise: &promise.Promise{
@@ -747,7 +747,7 @@ func TestResolvePromise(t *testing.T) {
747747
Id: "foo",
748748
},
749749
req: &t_api.Request{
750-
Kind: t_api.ResolvePromise,
750+
Kind: t_api.CompletePromise,
751751
CompletePromise: &t_api.CompletePromiseRequest{
752752
Id: "foo",
753753
IdempotencyKey: nil,
@@ -760,7 +760,7 @@ func TestResolvePromise(t *testing.T) {
760760
},
761761
},
762762
res: &t_api.Response{
763-
Kind: t_api.ResolvePromise,
763+
Kind: t_api.CompletePromise,
764764
CompletePromise: &t_api.CompletePromiseResponse{
765765
Status: t_api.StatusPromiseAlreadyRejected,
766766
Promise: &promise.Promise{
@@ -830,7 +830,7 @@ func TestRejectPromise(t *testing.T) {
830830
},
831831
},
832832
req: &t_api.Request{
833-
Kind: t_api.RejectPromise,
833+
Kind: t_api.CompletePromise,
834834
CompletePromise: &t_api.CompletePromiseRequest{
835835
Id: "foo",
836836
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -843,7 +843,7 @@ func TestRejectPromise(t *testing.T) {
843843
},
844844
},
845845
res: &t_api.Response{
846-
Kind: t_api.RejectPromise,
846+
Kind: t_api.CompletePromise,
847847
CompletePromise: &t_api.CompletePromiseResponse{
848848
Status: t_api.StatusCreated,
849849
Promise: &promise.Promise{
@@ -860,7 +860,7 @@ func TestRejectPromise(t *testing.T) {
860860
Id: "foo",
861861
},
862862
req: &t_api.Request{
863-
Kind: t_api.RejectPromise,
863+
Kind: t_api.CompletePromise,
864864
CompletePromise: &t_api.CompletePromiseRequest{
865865
Id: "foo",
866866
IdempotencyKey: nil,
@@ -873,7 +873,7 @@ func TestRejectPromise(t *testing.T) {
873873
},
874874
},
875875
res: &t_api.Response{
876-
Kind: t_api.RejectPromise,
876+
Kind: t_api.CompletePromise,
877877
CompletePromise: &t_api.CompletePromiseResponse{
878878
Status: t_api.StatusCreated,
879879
Promise: &promise.Promise{
@@ -890,7 +890,7 @@ func TestRejectPromise(t *testing.T) {
890890
Id: "foo",
891891
},
892892
req: &t_api.Request{
893-
Kind: t_api.RejectPromise,
893+
Kind: t_api.CompletePromise,
894894
CompletePromise: &t_api.CompletePromiseRequest{
895895
Id: "foo",
896896
IdempotencyKey: nil,
@@ -903,7 +903,7 @@ func TestRejectPromise(t *testing.T) {
903903
},
904904
},
905905
res: &t_api.Response{
906-
Kind: t_api.RejectPromise,
906+
Kind: t_api.CompletePromise,
907907
CompletePromise: &t_api.CompletePromiseResponse{
908908
Status: t_api.StatusPromiseAlreadyResolved,
909909
Promise: &promise.Promise{

‎internal/app/subsystems/api/http/http_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ func TestHttpServer(t *testing.T) {
413413
}
414414
}`),
415415
req: &t_api.Request{
416-
Kind: t_api.CancelPromise,
416+
Kind: t_api.CompletePromise,
417417
CompletePromise: &t_api.CompletePromiseRequest{
418418
Id: "foo/bar",
419419
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -426,7 +426,7 @@ func TestHttpServer(t *testing.T) {
426426
},
427427
},
428428
res: &t_api.Response{
429-
Kind: t_api.CancelPromise,
429+
Kind: t_api.CompletePromise,
430430
CompletePromise: &t_api.CompletePromiseResponse{
431431
Status: t_api.StatusCreated,
432432
Promise: &promise.Promise{
@@ -445,7 +445,7 @@ func TestHttpServer(t *testing.T) {
445445
"state": "REJECTED_CANCELED"
446446
}`),
447447
req: &t_api.Request{
448-
Kind: t_api.CancelPromise,
448+
Kind: t_api.CompletePromise,
449449
CompletePromise: &t_api.CompletePromiseRequest{
450450
Id: "foo",
451451
IdempotencyKey: nil,
@@ -458,7 +458,7 @@ func TestHttpServer(t *testing.T) {
458458
},
459459
},
460460
res: &t_api.Response{
461-
Kind: t_api.CancelPromise,
461+
Kind: t_api.CompletePromise,
462462
CompletePromise: &t_api.CompletePromiseResponse{
463463
Status: t_api.StatusCreated,
464464
Promise: &promise.Promise{
@@ -485,7 +485,7 @@ func TestHttpServer(t *testing.T) {
485485
}
486486
}`),
487487
req: &t_api.Request{
488-
Kind: t_api.ResolvePromise,
488+
Kind: t_api.CompletePromise,
489489
CompletePromise: &t_api.CompletePromiseRequest{
490490
Id: "foo/bar",
491491
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -498,7 +498,7 @@ func TestHttpServer(t *testing.T) {
498498
},
499499
},
500500
res: &t_api.Response{
501-
Kind: t_api.ResolvePromise,
501+
Kind: t_api.CompletePromise,
502502
CompletePromise: &t_api.CompletePromiseResponse{
503503
Status: t_api.StatusCreated,
504504
Promise: &promise.Promise{
@@ -517,7 +517,7 @@ func TestHttpServer(t *testing.T) {
517517
"state": "RESOLVED"
518518
}`),
519519
req: &t_api.Request{
520-
Kind: t_api.ResolvePromise,
520+
Kind: t_api.CompletePromise,
521521
CompletePromise: &t_api.CompletePromiseRequest{
522522
Id: "foo",
523523
IdempotencyKey: nil,
@@ -530,7 +530,7 @@ func TestHttpServer(t *testing.T) {
530530
},
531531
},
532532
res: &t_api.Response{
533-
Kind: t_api.ResolvePromise,
533+
Kind: t_api.CompletePromise,
534534
CompletePromise: &t_api.CompletePromiseResponse{
535535
Status: t_api.StatusCreated,
536536
Promise: &promise.Promise{
@@ -557,7 +557,7 @@ func TestHttpServer(t *testing.T) {
557557
}
558558
}`),
559559
req: &t_api.Request{
560-
Kind: t_api.RejectPromise,
560+
Kind: t_api.CompletePromise,
561561
CompletePromise: &t_api.CompletePromiseRequest{
562562
Id: "foo/bar",
563563
IdempotencyKey: util.ToPointer(idempotency.Key("bar")),
@@ -570,7 +570,7 @@ func TestHttpServer(t *testing.T) {
570570
},
571571
},
572572
res: &t_api.Response{
573-
Kind: t_api.RejectPromise,
573+
Kind: t_api.CompletePromise,
574574
CompletePromise: &t_api.CompletePromiseResponse{
575575
Status: t_api.StatusCreated,
576576
Promise: &promise.Promise{
@@ -589,7 +589,7 @@ func TestHttpServer(t *testing.T) {
589589
"state": "REJECTED"
590590
}`),
591591
req: &t_api.Request{
592-
Kind: t_api.RejectPromise,
592+
Kind: t_api.CompletePromise,
593593
CompletePromise: &t_api.CompletePromiseRequest{
594594
Id: "foo",
595595
IdempotencyKey: nil,
@@ -602,7 +602,7 @@ func TestHttpServer(t *testing.T) {
602602
},
603603
},
604604
res: &t_api.Response{
605-
Kind: t_api.RejectPromise,
605+
Kind: t_api.CompletePromise,
606606
CompletePromise: &t_api.CompletePromiseResponse{
607607
Status: t_api.StatusCreated,
608608
Promise: &promise.Promise{

‎internal/app/subsystems/api/service/promise.go

+1-17
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,10 @@ func (s *Service) CreatePromise(header *CreatePromiseHeader, body *promise.Promi
176176
func (s *Service) CompletePromise(id string, state promise.State, header *CompletePromiseHeader, body *CompletePromiseBody) (*t_api.CompletePromiseResponse, error) {
177177
cq := make(chan *bus.CQE[t_api.Request, t_api.Response], 1)
178178

179-
var kind = ToKind(state)
180-
181179
s.api.Enqueue(&bus.SQE[t_api.Request, t_api.Response]{
182180
Metadata: s.metadata(header.RequestId, "complete-promise"),
183181
Submission: &t_api.Request{
184-
Kind: kind,
182+
Kind: t_api.CompletePromise,
185183
CompletePromise: &t_api.CompletePromiseRequest{
186184
Id: id,
187185
IdempotencyKey: header.IdempotencyKey,
@@ -209,17 +207,3 @@ func (s *Service) CompletePromise(id string, state promise.State, header *Comple
209207
// success
210208
return cqe.Completion.CompletePromise, nil
211209
}
212-
213-
func ToKind(state promise.State) t_api.Kind {
214-
215-
switch state {
216-
case promise.Canceled:
217-
return t_api.CancelPromise
218-
case promise.Rejected:
219-
return t_api.RejectPromise
220-
case promise.Resolved:
221-
return t_api.ResolvePromise
222-
default:
223-
panic("State not valid.")
224-
}
225-
}

‎internal/kernel/t_api/api.go

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package t_api
22

3-
import "github.com/resonatehq/resonate/pkg/promise"
4-
53
type Kind int
64

75
const (
86
// PROMISES
97
ReadPromise Kind = iota
108
SearchPromises
119
CreatePromise
12-
CancelPromise
13-
ResolvePromise
14-
RejectPromise
10+
CompletePromise
1511

1612
// SCHEDULES
1713
ReadSchedule
@@ -42,12 +38,8 @@ func (k Kind) String() string {
4238
return "search-promises"
4339
case CreatePromise:
4440
return "create-promise"
45-
case CancelPromise:
46-
return "cancel-promise"
47-
case ResolvePromise:
48-
return "resolve-promise"
49-
case RejectPromise:
50-
return "reject-promise"
41+
case CompletePromise:
42+
return "complete-promise"
5143
// SCHEDULES
5244
case ReadSchedule:
5345
return "read-schedule"
@@ -75,16 +67,3 @@ func (k Kind) String() string {
7567
panic("invalid api")
7668
}
7769
}
78-
79-
func From(state promise.State) Kind {
80-
switch state {
81-
case promise.Canceled:
82-
return CancelPromise
83-
case promise.Rejected:
84-
return RejectPromise
85-
case promise.Resolved:
86-
return ResolvePromise
87-
default:
88-
panic("invalid state")
89-
}
90-
}

0 commit comments

Comments
 (0)