Commit cbf1ff41 authored by Conner Fromknecht's avatar Conner Fromknecht

fix: small bugs in teleportr API server

This commit fixes:
 * A bug in /status where is_available always returns false.
 * A bug in /track where the "teleport" key was incorrectly capitalized.
 * A bug in /track and /history where disbursements were never
   populated, also changes the behavior to show null when the
   disubrsement has not been processed.
parent 7bcf88ef
......@@ -279,7 +279,7 @@ func (s *Server) HandleStatus(
balanceAfterMaxDeposit := new(big.Int).Add(
curBalance, maxDepositAmount,
)
isAvailable := curBalance.Cmp(balanceAfterMaxDeposit) >= 0
isAvailable := maxBalance.Cmp(balanceAfterMaxDeposit) >= 0
resp := StatusResponse{
CurrentBalanceWei: curBalance.String(),
......@@ -395,7 +395,7 @@ type RPCTeleport struct {
TxHash string `json:"tx_hash"`
BlockNumber string `json:"block_number"`
BlockTimestamp string `json:"block_timestamp_unix"`
Disbursement *RPCDisbursement `json:"disbursement,omitempty"`
Disbursement *RPCDisbursement `json:"disbursement"`
}
func makeRPCTeleport(teleport *db.Teleport) RPCTeleport {
......@@ -407,7 +407,7 @@ func makeRPCTeleport(teleport *db.Teleport) RPCTeleport {
BlockNumber: strconv.FormatUint(teleport.Deposit.BlockNumber, 10),
BlockTimestamp: strconv.FormatInt(teleport.Deposit.BlockTimestamp.Unix(), 10),
}
if rpcTeleport.Disbursement != nil {
if teleport.Disbursement != nil {
rpcTeleport.Disbursement = &RPCDisbursement{
TxHash: teleport.Disbursement.TxnHash.String(),
BlockNumber: strconv.FormatUint(teleport.Disbursement.BlockNumber, 10),
......@@ -429,7 +429,7 @@ type TrackResponse struct {
CurrentBlockNumber string `json:"current_block_number"`
ConfirmationsRequired string `json:"confirmations_required"`
ConfirmationsRemaining string `json:"confirmations_remaining"`
Teleport RPCTeleport
Teleport RPCTeleport `json:"teleport"`
}
func (s *Server) HandleTrack(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment