Minor fixes

This commit is contained in:
Kirill Fedoseev 2022-05-26 17:51:39 +04:00
parent 645160c9d3
commit c2548e248c
2 changed files with 5 additions and 7 deletions

View File

@ -122,11 +122,12 @@ func (p *Presenter) getBridgeSideInfo(ctx context.Context, bridgeID string, cfg
func (p *Presenter) getBlockTimeOrDefault(ctx context.Context, chainID string, blockNumber uint) (time.Time, error) { func (p *Presenter) getBlockTimeOrDefault(ctx context.Context, chainID string, blockNumber uint) (time.Time, error) {
bt, err := p.repo.BlockTimestamps.GetByBlockNumber(ctx, chainID, blockNumber) bt, err := p.repo.BlockTimestamps.GetByBlockNumber(ctx, chainID, blockNumber)
if err != nil && !errors.Is(err, db.ErrNotFound) { if err != nil && !errors.Is(err, db.ErrNotFound) {
if errors.Is(err, db.ErrNotFound) {
return time.Time{}, nil
}
return time.Time{}, fmt.Errorf("failed to get block timestamp: %w", err) return time.Time{}, fmt.Errorf("failed to get block timestamp: %w", err)
} else if err == nil {
return bt.Timestamp, nil
} }
return time.Time{}, nil return bt.Timestamp, nil
} }
func (p *Presenter) GetBridgeConfig(w http.ResponseWriter, r *http.Request) { func (p *Presenter) GetBridgeConfig(w http.ResponseWriter, r *http.Request) {

View File

@ -77,10 +77,7 @@ func (r *bridgeValidatorsRepo) FindActiveValidators(ctx context.Context, bridgeI
vals := make([]*entity.BridgeValidator, 0, 10) vals := make([]*entity.BridgeValidator, 0, 10)
err = r.db.SelectContext(ctx, &vals, q, args...) err = r.db.SelectContext(ctx, &vals, q, args...)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { return nil, fmt.Errorf("can't get bridge validators: %w", err)
return nil, nil
}
return nil, fmt.Errorf("can't get bridge validator: %w", err)
} }
return vals, nil return vals, nil
} }