Merge pull request #77 from kaleido-io/full-full-receipts

Pass through EthConnect/EVMConnect receipts unchanged
hyperledger · Aug 10, 2022 · eba8492 · eba8492
2 parents c4d1223 + 0aed1f4
commit eba8492
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/src/eventstream-proxy/eventstream-proxy.base.ts b/src/eventstream-proxy/eventstream-proxy.base.ts
@@ -17,7 +17,7 @@
 import { Logger } from '@nestjs/common';
 import { MessageBody, SubscribeMessage } from '@nestjs/websockets';
 import { v4 as uuidv4 } from 'uuid';
-import { Event } from '../event-stream/event-stream.interfaces';
+import { Event, EventStreamReply } from '../event-stream/event-stream.interfaces';
 import { EventStreamService, EventStreamSocket } from '../event-stream/event-stream.service';
 import {
   WebSocketEventsBase,
@@ -27,7 +27,6 @@ import {
 import {
   AckMessageData,
   EventListener,
-  ReceiptEvent,
   WebSocketMessageBatchData,
   WebSocketMessageWithId,
 } from './eventstream-proxy.interfaces';
@@ -86,12 +85,7 @@ export abstract class EventStreamProxyBase extends WebSocketEventsBase {
         this.queueTask(() => this.processEvents(events));
       },
       receipt => {
-        this.broadcast('receipt', <ReceiptEvent>{
-          id: receipt.headers?.requestId,
-          success: receipt.headers?.type === 'TransactionSuccess',
-          message: receipt.errorMessage,
-          ...receipt,
-        });
+        this.broadcast('receipt', <EventStreamReply>receipt);
       },
     );
   }

diff --git a/src/eventstream-proxy/eventstream-proxy.interfaces.ts b/src/eventstream-proxy/eventstream-proxy.interfaces.ts
@@ -26,17 +26,6 @@ export interface EventListener {
   onEvent: (subName: string, event: Event, process: EventProcessor) => void | Promise<void>;
 }
 
-export class ReceiptEvent {
-  @ApiProperty()
-  id: string;
-
-  @ApiProperty()
-  success: boolean;
-
-  @ApiProperty()
-  message?: string;
-}
-
 export interface WebSocketMessageWithId extends WebSocketMessage {
   id: string;
 }

diff --git a/test/suites/websocket.ts b/test/suites/websocket.ts
@@ -19,7 +19,6 @@ import {
   EventStreamReply,
   EventStreamSubscription,
 } from '../../src/event-stream/event-stream.interfaces';
-import { ReceiptEvent } from '../../src/eventstream-proxy/eventstream-proxy.interfaces';
 import {
   ApprovalForAllEvent,
   ERC20ApprovalEvent,
@@ -860,9 +859,11 @@ export default (context: TestContext) => {
       .expectJson(message => {
         expect(message).toMatchObject(<WebSocketMessage>{
           event: 'receipt',
-          data: <ReceiptEvent>{
-            id: '1',
-            success: true,
+          data: <EventStreamReply>{
+            headers: {
+              requestId: '1',
+              type: 'TransactionSuccess',
+            },
           },
         });
         return true;
@@ -885,10 +886,12 @@ export default (context: TestContext) => {
       .expectJson(message => {
         expect(message).toMatchObject(<WebSocketMessage>{
           event: 'receipt',
-          data: <ReceiptEvent>{
-            id: '1',
-            success: false,
-            message: 'Failed',
+          data: <EventStreamReply>{
+            headers: {
+              requestId: '1',
+              type: 'Error',
+            },
+            errorMessage: 'Failed',
           },
         });
         return true;