zecfoundation
/
lightwalletd
mirror of https://github.com/ZcashFoundation/lightwalletd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve errors

This commit is contained in:
Aditya Kulkarni 2020-06-28 09:59:45 -07:00
parent fc8ebbcc0f
commit e640edf40c
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/service.go
View File

@ -75,7 +75,7 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA
if addressBlockFilter == nil || addressBlockFilter.Range == nil || addressBlockFilter.Range.Start == nil || addressBlockFilter.Range.End == nil { if addressBlockFilter == nil || addressBlockFilter.Range == nil || addressBlockFilter.Range.Start == nil || addressBlockFilter.Range.End == nil {
s.log.Errorf("Bad Structure") s.log.Errorf("Bad Structure")
return nil return ErrUnspecified
} }
// Test to make sure Address is a single t address // Test to make sure Address is a single t address
@ -84,7 +84,7 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA
s.metrics.TotalErrors.Inc() s.metrics.TotalErrors.Inc()
s.log.Errorf("Unrecognized address: %s", addressBlockFilter.Address) s.log.Errorf("Unrecognized address: %s", addressBlockFilter.Address)
return nil return errors.New("Unrecognized Address")
} }
params := make([]json.RawMessage, 1) params := make([]json.RawMessage, 1)
@ -105,16 +105,16 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA
errCode, err = strconv.ParseInt(errParts[0], 10, 32) errCode, err = strconv.ParseInt(errParts[0], 10, 32)
//Check to see if we are requesting a height the zcashd doesn't have yet //Check to see if we are requesting a height the zcashd doesn't have yet
if err == nil && errCode == -8 { if err == nil && errCode == -8 {
return nil return ErrUnspecified
} }
return nil return rpcErr
} }
var txids []string var txids []string
err = json.Unmarshal(result, &txids) err = json.Unmarshal(result, &txids)
if err != nil { if err != nil {
s.log.Errorf("Got error: %s", err.Error()) s.log.Errorf("Got error: %s", err.Error())
return nil return err
} }
timeout, cancel := context.WithTimeout(resp.Context(), 30*time.Second) timeout, cancel := context.WithTimeout(resp.Context(), 30*time.Second)
@ -133,7 +133,7 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA
s.metrics.TotalErrors.Inc() s.metrics.TotalErrors.Inc()
s.log.Errorf("Got error: %s", err.Error()) s.log.Errorf("Got error: %s", err.Error())
return nil return err
} }
resp.Send(tx) resp.Send(tx)
@ -181,7 +181,7 @@ func (s *SqlStreamer) dailyActiveBlock(height uint64, peerip string) {
func (s *SqlStreamer) GetBlock(ctx context.Context, id *walletrpc.BlockID) (*walletrpc.CompactBlock, error) { func (s *SqlStreamer) GetBlock(ctx context.Context, id *walletrpc.BlockID) (*walletrpc.CompactBlock, error) {
if id.Height == 0 && id.Hash == nil { if id == nil || (id.Height == 0 && id.Hash == nil) {
return nil, ErrUnspecified return nil, ErrUnspecified
} }
@ -216,6 +216,9 @@ func (s *SqlStreamer) GetBlock(ctx context.Context, id *walletrpc.BlockID) (*wal
} }
func (s *SqlStreamer) GetBlockRange(span *walletrpc.BlockRange, resp walletrpc.CompactTxStreamer_GetBlockRangeServer) error { func (s *SqlStreamer) GetBlockRange(span *walletrpc.BlockRange, resp walletrpc.CompactTxStreamer_GetBlockRangeServer) error {
if span == nil || span.Start == nil || span.End == nil {
return ErrUnspecified
}
blockChan := make(chan walletrpc.CompactBlock) blockChan := make(chan walletrpc.CompactBlock)
errChan := make(chan error) errChan := make(chan error)
@ -305,6 +308,10 @@ func (s *SqlStreamer) GetTransaction(ctx context.Context, txf *walletrpc.TxFilte
var txBytes []byte var txBytes []byte
var txHeight float64 var txHeight float64
if txf == nil {
return nil, ErrUnspecified
}
if txf.Hash != nil { if txf.Hash != nil {
txid := txf.Hash txid := txf.Hash
for left, right := 0, len(txid)-1; left < right; left, right = left+1, right-1 { for left, right := 0, len(txid)-1; left < right; left, right = left+1, right-1 {
@ -438,6 +445,10 @@ func (s *SqlStreamer) SendTransaction(ctx context.Context, rawtx *walletrpc.RawT
// Result: // Result:
// "hex" (string) The transaction hash in hex // "hex" (string) The transaction hash in hex
if rawtx == nil || rawtx.Data == nil {
return nil, ErrUnspecified
}
// Construct raw JSON-RPC params // Construct raw JSON-RPC params
params := make([]json.RawMessage, 1) params := make([]json.RawMessage, 1)
txHexString := hex.EncodeToString(rawtx.Data) txHexString := hex.EncodeToString(rawtx.Data)