Browse Source

Fix format of the MTP for exit endpoint

feature/sql-semaphore1
Arnau B 3 years ago
parent
commit
8083e4fec3
2 changed files with 20 additions and 33 deletions
  1. +16
    -16
      api/swagger.yml
  2. +4
    -17
      db/historydb/views.go

+ 16
- 16
api/swagger.yml

@ -2346,35 +2346,35 @@ components:
type: object type: object
description: Existence proof of a leaf in a given Merkle Root. Encoded as hexadecimal string. description: Existence proof of a leaf in a given Merkle Root. Encoded as hexadecimal string.
properties: properties:
Root:
root:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
Siblings:
siblings:
type: array type: array
items: items:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
OldKey:
oldKey:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
OldValue:
oldValue:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
IsOld0:
isOld0:
type: boolean type: boolean
Key:
key:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
Value:
value:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'
Fnc:
fnc:
type: integer type: integer
maximum: 3 maximum: 3
minimum: 0 minimum: 0
required: required:
- Root
- Siblings
- OldKey
- OldValue
- IsOld0
- Key
- Value
- Fnc
- root
- siblings
- oldKey
- oldValue
- isOld0
- key
- value
- fnc
additionalProperties: false additionalProperties: false
balance: balance:
$ref: '#/components/schemas/BigInt' $ref: '#/components/schemas/BigInt'

+ 4
- 17
db/historydb/views.go

@ -190,24 +190,11 @@ type ExitAPI struct {
// MarshalJSON is used to neast some of the fields of ExitAPI // MarshalJSON is used to neast some of the fields of ExitAPI
// without the need of auxiliar structs // without the need of auxiliar structs
func (e ExitAPI) MarshalJSON() ([]byte, error) { func (e ExitAPI) MarshalJSON() ([]byte, error) {
siblings := []string{}
for i := 0; i < len(e.MerkleProof.Siblings); i++ {
siblings = append(siblings, e.MerkleProof.Siblings[i].String())
}
return json.Marshal(map[string]interface{}{ return json.Marshal(map[string]interface{}{
"itemId": e.ItemID,
"batchNum": e.BatchNum,
"accountIndex": e.AccountIdx,
"merkleProof": map[string]interface{}{
"Root": e.MerkleProof.Root.String(),
"Siblings": siblings,
"OldKey": e.MerkleProof.OldKey.String(),
"OldValue": e.MerkleProof.OldValue.String(),
"IsOld0": e.MerkleProof.IsOld0,
"Key": e.MerkleProof.Key.String(),
"Value": e.MerkleProof.Value.String(),
"Fnc": e.MerkleProof.Fnc,
},
"itemId": e.ItemID,
"batchNum": e.BatchNum,
"accountIndex": e.AccountIdx,
"merkleProof": e.MerkleProof,
"balance": e.Balance, "balance": e.Balance,
"instantWithdrawn": e.InstantWithdrawn, "instantWithdrawn": e.InstantWithdrawn,
"delayedWithdrawRequest": e.DelayedWithdrawRequest, "delayedWithdrawRequest": e.DelayedWithdrawRequest,

Loading…
Cancel
Save