Merge branch 'miguel/feehistory2' of https://github.com/vechain/thor …

…into miguel/feehistory3
vechain · Jan 31, 2025 · 8c5dff4 · 8c5dff4
2 parents e125e86 + fd10385
commit 8c5dff4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/api/fees/cache.go b/api/fees/cache.go
@@ -19,7 +19,7 @@ import (
 	"github.com/vechain/thor/v2/thor"
 )
 
-func NewFeesCache(repo *chain.Repository, backtraceLimit uint32, fixedSize uint32) *FeesCache {
+func newFeesCache(repo *chain.Repository, backtraceLimit uint32, fixedSize uint32) *FeesCache {
 	size := int(math.Min(float64(backtraceLimit), float64(fixedSize)))
 	return &FeesCache{
 		repo:           repo,
@@ -53,7 +53,7 @@ func (fc *FeesCache) getByRevision(rev *utils.Revision, bft bft.Committer) (*Fee
 	return fc.get(id)
 }
 
-func (fc *FeesCache) Push(header *block.Header) {
+func (fc *FeesCache) push(header *block.Header) {
 	fc.cache.Set(header.ID(), newFeesCacheEntry(header), float64(header.Number()))
 }
 

diff --git a/api/fees/fees.go b/api/fees/fees.go
@@ -27,7 +27,7 @@ func New(repo *chain.Repository, bft bft.Committer, backtraceLimit uint32, fixed
 	return &Fees{
 		repo:  repo,
 		bft:   bft,
-		cache: NewFeesCache(repo, backtraceLimit, fixedCacheSize),
+		cache: newFeesCache(repo, backtraceLimit, fixedCacheSize),
 		done:  make(chan struct{}),
 	}
 }
@@ -205,7 +205,7 @@ func (f *Fees) pushBestBlockToCache() {
 		select {
 		case <-ticker.C():
 			bestBlockSummary := f.repo.BestBlockSummary()
-			f.cache.Push(bestBlockSummary.Header)
+			f.cache.push(bestBlockSummary.Header)
 		case <-f.done:
 			return
 		}

diff --git a/api/fees/fees_test.go b/api/fees/fees_test.go
@@ -25,14 +25,7 @@ import (
 
 const expectedGasPriceUsedRatio = 0.0021
 
-func TestFees(t *testing.T) {
-	t.Run("testFeesBacktraceGreaterThanFixedSize", testFeesBacktraceGreaterThanFixedSize)
-	t.Run("testFeesFixedSizeGreaterThanBacktrace", testFeesFixedSizeGreaterThanBacktrace)
-	t.Run("testFeesFixedSizeSameAsBacktrace", testFeesFixedSizeSameAsBacktrace)
-}
-
-
-func testFeesBacktraceGreaterThanFixedSize(t *testing.T) {
+func TestFeesBacktraceGreaterThanFixedSize(t *testing.T) {
 	ts, closeFunc := initFeesServer(t, 8, 10, 10)
 	t.Cleanup(func() {
 		closeFunc()
@@ -54,7 +47,7 @@ func testFeesBacktraceGreaterThanFixedSize(t *testing.T) {
 	}
 }
 
-func testFeesFixedSizeGreaterThanBacktrace(t *testing.T) {
+func TestFeesFixedSizeGreaterThanBacktrace(t *testing.T) {
 	ts, closeFunc := initFeesServer(t, 8, 6, 10)
 	defer func() {
 		closeFunc()
@@ -71,7 +64,7 @@ func testFeesFixedSizeGreaterThanBacktrace(t *testing.T) {
 	}
 }
 
-func testFeesFixedSizeSameAsBacktrace(t *testing.T) {
+func TestFeesFixedSizeSameAsBacktrace(t *testing.T) {
 	// Less blocks than the backtrace limit
 	ts, closeFunc := initFeesServer(t, 11, 11, 10)
 	defer func() {