Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

services/horizon: Rename OperationFeeStats to FeeStats #1953

Merged
merged 1 commit into from
Nov 21, 2019
Merged

services/horizon: Rename OperationFeeStats to FeeStats #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions services/horizon/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ file. This project adheres to [Semantic Versioning](http://semver.org/).
As this project is pre 1.0, breaking changes may happen for minor version
bumps. A breaking change will get clearly notified in this log.

## v0.24.0

* Rename `OperationFeeStats` to `FeeStats` ([#1950](https://github.com/stellar/go/pull/1950))

## v0.23.1

* Add `ReadTimeout` to Horizon HTTP server configuration to fix potential DoS vector.
Expand Down
12 changes: 6 additions & 6 deletions services/horizon/internal/actions_operation_fee_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (

// This file contains the actions:
//
// OperationFeeStatsAction: stats representing current state of network fees
// FeeStatsAction: stats representing current state of network fees

var _ actions.JSONer = (*OperationFeeStatsAction)(nil)
var _ actions.JSONer = (*FeeStatsAction)(nil)

// OperationFeeStatsAction renders a few useful statistics that describe the
// FeeStatsAction renders a few useful statistics that describe the
// current state of operation fees on the network.
type OperationFeeStatsAction struct {
type FeeStatsAction struct {
Action
FeeMin int64
FeeMode int64
Expand All @@ -39,7 +39,7 @@ type OperationFeeStatsAction struct {
}

// JSON is a method for actions.JSON
func (action *OperationFeeStatsAction) JSON() error {
func (action *FeeStatsAction) JSON() error {
if !action.App.config.IngestFailedTransactions {
// If Horizon is not ingesting failed transaction it does not make sense to display
// operation fee stats because they will be incorrect.
Expand Down Expand Up @@ -80,7 +80,7 @@ func (action *OperationFeeStatsAction) JSON() error {
return action.Err
}

func (action *OperationFeeStatsAction) loadRecords() {
func (action *FeeStatsAction) loadRecords() {
cur := operationfeestats.CurrentState()
action.FeeMin = cur.FeeMin
action.FeeMode = cur.FeeMode
Expand Down
6 changes: 3 additions & 3 deletions services/horizon/internal/actions_operation_fee_stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestOperationFeeTestsActions_Show(t *testing.T) {
_, err := ht.HorizonSession().ExecRaw("UPDATE history_ledgers SET max_tx_set_size = 50")
ht.Require.NoError(err)

ht.App.UpdateOperationFeeStatsState()
ht.App.UpdateFeeStatsState()

w := ht.Get("/fee_stats")

Expand Down Expand Up @@ -134,7 +134,7 @@ func TestOperationFeeTestsActions_ShowMultiOp(t *testing.T) {
_, err = ht.HorizonSession().ExecRaw("UPDATE history_transactions SET operation_count = operation_count * 2")
ht.Require.NoError(err)

ht.App.UpdateOperationFeeStatsState()
ht.App.UpdateFeeStatsState()

w := ht.Get("/fee_stats")

Expand Down Expand Up @@ -172,7 +172,7 @@ func TestOperationFeeTestsActions_NotInterpolating(t *testing.T) {
_, err = ht.HorizonSession().ExecRaw("UPDATE history_transactions SET max_fee = 256000, operation_count = 16 WHERE transaction_hash = '6a349e7331e93a251367287e274fb1699abaf723bde37aebe96248c76fd3071a'")
ht.Require.NoError(err)

ht.App.UpdateOperationFeeStatsState()
ht.App.UpdateFeeStatsState()

w := ht.Get("/fee_stats")

Expand Down
8 changes: 4 additions & 4 deletions services/horizon/internal/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ func (a *App) UpdateLedgerState() {
ledger.SetState(next)
}

// UpdateOperationFeeStatsState triggers a refresh of several operation fee metrics.
func (a *App) UpdateOperationFeeStatsState() {
// UpdateFeeStatsState triggers a refresh of several operation fee metrics.
func (a *App) UpdateFeeStatsState() {
var (
next operationfeestats.State
latest history.LatestLedger
Expand Down Expand Up @@ -245,7 +245,7 @@ func (a *App) UpdateOperationFeeStatsState() {
next.LastBaseFee = int64(latest.BaseFee)
next.LastLedger = int64(latest.Sequence)

err = a.HistoryQ().OperationFeeStats(latest.Sequence, &feeStats)
err = a.HistoryQ().FeeStats(latest.Sequence, &feeStats)
if err != nil {
logErr(err, "failed to load operation fee stats")
return
Expand Down Expand Up @@ -355,7 +355,7 @@ func (a *App) Tick() {
// update ledger state, operation fee state, and stellar-core info in parallel
wg.Add(3)
go func() { a.UpdateLedgerState(); wg.Done() }()
go func() { a.UpdateOperationFeeStatsState(); wg.Done() }()
go func() { a.UpdateFeeStatsState(); wg.Done() }()
go func() { a.UpdateStellarCoreInfo(); wg.Done() }()
wg.Wait()

Expand Down
4 changes: 2 additions & 2 deletions services/horizon/internal/db2/history/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ func (r *Operation) UnmarshalDetails(dest interface{}) error {
return err
}

// OperationFeeStats returns operation fee stats for the last 5 ledgers.
// FeeStats returns operation fee stats for the last 5 ledgers.
// Currently, we hard code the query to return the last 5 ledgers worth of transactions.
// TODO: make the number of ledgers configurable.
func (q *Q) OperationFeeStats(currentSeq int32, dest *FeeStats) error {
func (q *Q) FeeStats(currentSeq int32, dest *FeeStats) error {
return q.GetRaw(dest, `
SELECT
ceil(min(max_fee/operation_count))::bigint AS "min",
Expand Down
2 changes: 1 addition & 1 deletion services/horizon/internal/main_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (action OffersByAccountAction) Handle(w http.ResponseWriter, r *http.Reques
ap.Execute(&action)
}

func (action OperationFeeStatsAction) Handle(w http.ResponseWriter, r *http.Request) {
func (action FeeStatsAction) Handle(w http.ResponseWriter, r *http.Request) {
ap := &action.Action
ap.Prepare(w, r)
ap.Execute(&action)
Expand Down
2 changes: 1 addition & 1 deletion services/horizon/internal/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func (w *web) mustInstallActions(
}

// Network state related endpoints
r.Get("/fee_stats", OperationFeeStatsAction{}.Handle)
r.Get("/fee_stats", FeeStatsAction{}.Handle)

// friendbot
if config.FriendbotURL != nil {
Expand Down