Merge pull request #2326 from cfromknecht/teleportr-api-fixes

minor teleportr API fixes

go/teleportr/api/server.go

@@ -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),
@@ -426,10 +426,10 @@ type RPCDisbursement struct {
 }
 
 type TrackResponse struct {
-	CurrentBlockNumber     string `json:"current_block_number"`
-	ConfirmationsRequired  string `json:"confirmations_required"`
-	ConfirmationsRemaining string `json:"confirmations_remaining"`
-	Teleport               RPCTeleport
+	CurrentBlockNumber     string      `json:"current_block_number"`
+	ConfirmationsRequired  string      `json:"confirmations_required"`
+	ConfirmationsRemaining string      `json:"confirmations_remaining"`
+	Teleport               RPCTeleport `json:"teleport"`
 }
 
 func (s *Server) HandleTrack(

go/teleportr/db/db.go

@@ -147,7 +147,7 @@ func (c Config) WithoutDB() string {
 // sslMode retuns "enabled" if EnableSSL is true, otherwise returns "disabled".
 func (c Config) sslMode() string {
 	if c.EnableSSL {
-		return "enable"
+		return "require"
 	}
 	return "disable"
 }

go/teleportr/db/db_test.go

@@ -495,3 +495,78 @@ func TestDeletePendingTx(t *testing.T) {
 	require.Nil(t, err)
 	require.Nil(t, pendingTxs)
 }
+
+// TestLoadTeleports asserts that LoadTeleportByDepositHash and
+// LoadTeleportsByAddress are able to query for a spcific deposit in various
+// stages through the teleport process.
+func TestLoadTeleports(t *testing.T) {
+	t.Parallel()
+
+	d := newDatabase(t)
+	defer d.Close()
+
+	address := common.HexToAddress("0x01")
+	amount := big.NewInt(1000)
+	depTxnHash := common.HexToHash("0x0d01")
+	depBlockNumber := uint64(1)
+	disTxnHash := common.HexToHash("0x0e01")
+	disBlockNumber := uint64(2)
+
+	// Insert deposit.
+	deposit1 := db.Deposit{
+		ID:      1,
+		Address: address,
+		Amount:  amount,
+		ConfirmationInfo: db.ConfirmationInfo{
+			TxnHash:        depTxnHash,
+			BlockNumber:    depBlockNumber,
+			BlockTimestamp: testTimestamp,
+		},
+	}
+
+	err := d.UpsertDeposits([]db.Deposit{deposit1}, 0)
+	require.Nil(t, err)
+
+	// The same, undisbursed teleport should be retruned by hash and address.
+	expTeleport := db.Teleport{
+		Deposit:      deposit1,
+		Disbursement: nil,
+	}
+
+	teleport, err := d.LoadTeleportByDepositHash(depTxnHash)
+	require.Nil(t, err)
+	require.NotNil(t, teleport)
+	require.Equal(t, expTeleport, *teleport)
+
+	teleports, err := d.LoadTeleportsByAddress(address)
+	require.Nil(t, err)
+	require.Equal(t, []db.Teleport{expTeleport}, teleports)
+
+	// Insert a disbursement for the above deposit.
+	err = d.UpsertDisbursement(
+		1, disTxnHash, disBlockNumber, testTimestamp, true,
+	)
+	require.Nil(t, err)
+
+	// The now-complete teleport should be returned from both queries.
+	expTeleport = db.Teleport{
+		Deposit: deposit1,
+		Disbursement: &db.Disbursement{
+			Success: true,
+			ConfirmationInfo: db.ConfirmationInfo{
+				TxnHash:        disTxnHash,
+				BlockNumber:    disBlockNumber,
+				BlockTimestamp: testTimestamp,
+			},
+		},
+	}
+
+	teleport, err = d.LoadTeleportByDepositHash(depTxnHash)
+	require.Nil(t, err)
+	require.NotNil(t, teleport)
+	require.Equal(t, expTeleport, *teleport)
+
+	teleports, err = d.LoadTeleportsByAddress(address)
+	require.Nil(t, err)
+	require.Equal(t, []db.Teleport{expTeleport}, teleports)
+}