Merge pull request #14 from Adamant-im/fix/transaction-types

Fix/transaction types
Adamant-im · Oct 9, 2023 · a6dc329 · a6dc329
2 parents ae55fe0 + f07dd4d
commit a6dc329
Show file tree

Hide file tree

Showing 15 changed files with 291 additions and 303 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/specification/common/transactions/ChatMessageTransaction.yaml b/specification/common/transactions/ChatMessageTransaction.yaml
@@ -7,8 +7,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 8
-        maximum: 8
+        enum: [8]
         example: 8
         description: Always equal to `8`
       asset:

diff --git a/specification/common/transactions/KVSTransaction.yaml b/specification/common/transactions/KVSTransaction.yaml
@@ -7,8 +7,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 9
-        maximum: 9
+        enum: [9]
         example: 9
         description: Always equal to `9`
       recipientId:

diff --git a/specification/common/transactions/RegisterDelegateTransaction.yaml b/specification/common/transactions/RegisterDelegateTransaction.yaml
@@ -7,8 +7,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 2
-        maximum: 2
+        enum: [2]
         example: 2
         description: Always equal to `2`
       recipientId:

diff --git a/specification/common/transactions/TokenTransferTransaction.yaml b/specification/common/transactions/TokenTransferTransaction.yaml
@@ -7,8 +7,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 0
-        maximum: 0
+        enum: [0]
         example: 0
         description: Always equal to `0`
       asset:

diff --git a/specification/common/transactions/VoteForDelegateTransaction.yaml b/specification/common/transactions/VoteForDelegateTransaction.yaml
@@ -25,8 +25,7 @@ allOf:
             description: List of Downvoted delegates
       type:
         type: integer
-        minimum: 3
-        maximum: 3
+        enum: [3]
         example: 3
         description: Always equal to `3`
       asset:
@@ -54,4 +53,3 @@ example:
     added: []
     deleted:
       - "c0c580c3fb89409f32181fef58935f286f0c1bbf61bd727084ed915b3a4bc95b"
-
diff --git a/specification/common/transactions/assets/ChatMessageAsset.yaml b/specification/common/transactions/assets/ChatMessageAsset.yaml
@@ -17,6 +17,7 @@ properties:
         description: Nonce
       type:
         type: integer
+        enum: [1, 2, 3]
         description:
           Type of chat message (1 - Basic Encrypted Message, 2 - Rich Content Message, 3 - Signal Message).
           See details https://github.com/Adamant-im/adamant/wiki/Message-Types

diff --git a/specification/common/transactions/assets/KVSTransactionAsset.yaml b/specification/common/transactions/assets/KVSTransactionAsset.yaml
@@ -15,8 +15,7 @@ properties:
         type: string
       type:
         type: integer
-        minimum: 0
-        maximum: 0
+        enum: [0]
 example:
   state:
     key: eth:address

diff --git a/specification/common/transactions/register/RegisterChatMessageTransaction.yaml b/specification/common/transactions/register/RegisterChatMessageTransaction.yaml
@@ -8,8 +8,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 8
-        maximum: 8
+        enum: [8]
         example: 8
         description: Always equal to `8`
       recipientId:

diff --git a/specification/common/transactions/register/RegisterKVSTransaction.yaml b/specification/common/transactions/register/RegisterKVSTransaction.yaml
@@ -7,8 +7,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 9
-        maximum: 9
+        enum: [9]
         example: 9
         description: Should be always equal to `9` (Store in KVS transaction type)
       asset:

diff --git a/specification/common/transactions/register/RegisterNewDelegateTransaction.yaml b/specification/common/transactions/register/RegisterNewDelegateTransaction.yaml
@@ -8,8 +8,7 @@ allOf:
     properties:
       type:
         type: integer
-        minimum: 2
-        maximum: 2
+        enum: [2]
         example: 2
         description: Should be always equal to `2`
       asset:

diff --git a/specification/common/transactions/register/RegisterTokenTransferTransaction.yaml b/specification/common/transactions/register/RegisterTokenTransferTransaction.yaml
@@ -8,6 +8,7 @@ allOf:
     properties:
       type:
         type: integer
+        enum: [0, 8]
         description: Can be `type 0 — Token transfer` or `type 8 — Chat/Message`.
       recipientId:
         type: string

diff --git a/specification/common/transactions/register/RegisterVoteForDelegateTransaction.yaml b/specification/common/transactions/register/RegisterVoteForDelegateTransaction.yaml
@@ -15,8 +15,7 @@ allOf:
         example: U14236667426471084862
       type:
         type: integer
-        minimum: 3
-        maximum: 3
+        enum: [3]
         example: 3
         description: Should be always equal to `3`
       senderId:

diff --git a/specification/delegates/RegisterDelegate/RegisterDelegateTransactionDto.yaml b/specification/delegates/RegisterDelegate/RegisterDelegateTransactionDto.yaml
@@ -9,13 +9,11 @@ allOf:
         $ref: "../../common/transactions/assets/RegisterDelegateAsset.yaml"
       type:
         type: integer
-        minimum: 2
-        maximum: 2
+        enum: [2]
         example: 2
         description: Always equal to `2`
       fee:
         type: integer
-        minimum: 300000000000
-        maximum: 300000000000
+        enum: [300000000000]
         example: 300000000000
         description: Always equal to `300000000000`
diff --git a/specification/delegates/RegisterVotes/RegisterVotesTransactionDto.yaml b/specification/delegates/RegisterVotes/RegisterVotesTransactionDto.yaml
@@ -11,8 +11,7 @@ allOf:
         $ref: "../../common/transactions/assets/VoteForDelegateAsset.yaml"
       type: # overrides QueuedTransaction.yaml
         type: integer
-        minimum: 3
-        maximum: 3
+        enum: [3]
         example: 3
         description: Always equal to `3`
       success: