fix: address comment with TicketDeprecatedEncodeError and fix unit tests

fix #2073
ecadlabs · Nov 4, 2022 · 4158036 · 4158036
1 parent 0d6dd3e
commit 4158036
Show file tree

Hide file tree

Showing 3 changed files with 583 additions and 5 deletions.
diff --git a/packages/taquito-michelson-encoder/src/schema/storage.ts b/packages/taquito-michelson-encoder/src/schema/storage.ts
@@ -9,6 +9,7 @@ import { createToken } from '../tokens/createToken';
 import { OrToken } from '../tokens/or';
 import { PairToken } from '../tokens/pair';
 import { TicketToken } from '../tokens/ticket';
+import { TicketDeprecatedToken } from '../tokens/ticket-deprecated';
 import {
   BigMapKeyType,
   Semantic,
@@ -161,6 +162,9 @@ export class Schema {
     if (this.root instanceof TicketToken && val.ticketer && val.value && val.amount) {
       return true;
     }
+    if (this.root instanceof TicketDeprecatedToken && val.ticketer && val.value && val.amount) {
+      return true;
+    }
     try {
       this.root.EncodeObject(val);
       return true;

diff --git a/packages/taquito-michelson-encoder/src/tokens/ticket-deprecated.ts b/packages/taquito-michelson-encoder/src/tokens/ticket-deprecated.ts
@@ -7,11 +7,11 @@ import { Token, TokenFactory, Semantic, SemanticEncoding } from './token';
  *  @category Error
  *  @description Error that indicates a failure when encoding and sending a ticket to the blockchain
  */
-export class EncodeTicketError extends Error {
-  name = 'TicketEncodeError';
+export class EncodeTicketDeprecatedError extends Error {
+  name = 'TicketDeprecatedEncodeError';
 
   constructor() {
-    super('Tickets cannot be sent to the blockchain; they are created on-chain');
+    super('Ticket_deprecated cannot be sent to the blockchain; they are created on-chain');
   }
 }
 
@@ -34,14 +34,14 @@ export class TicketDeprecatedToken extends Token {
   }
 
   public Encode(_args: any[]): any {
-    throw new EncodeTicketError();
+    throw new EncodeTicketDeprecatedError();
   }
 
   public EncodeObject(args: any, semantic?: SemanticEncoding): any {
     if (semantic && semantic[TicketDeprecatedToken.prim]) {
       return semantic[TicketDeprecatedToken.prim](args, this.val);
     }
-    throw new EncodeTicketError();
+    throw new EncodeTicketDeprecatedError();
   }
 
   public Execute(val: any, semantics?: Semantic) {