Backup cache purge

database/tbcd/level/headercache.go

@@ -50,9 +50,16 @@ func (l *lowIQMap) Get(k *chainhash.Hash) (*tbcd.BlockHeader, bool) {
 	return bh, ok
 }
 
+func (l *lowIQMap) Purge(k *chainhash.Hash) {
+	l.mtx.RLock()
+	defer l.mtx.RUnlock()
+
+	delete(l.m, *k)
+}
+
 func lowIQMapNewCount(count int) (*lowIQMap, error) {
 	if count <= 0 {
-		return nil, fmt.Errorf("invalid size %v", count)
+		return nil, fmt.Errorf("invalid count %v", count)
 	}
 	return &lowIQMap{
 		count: count,
@@ -69,5 +76,5 @@ func lowIQMapNewSize(size int) (*lowIQMap, error) {
 		return nil, fmt.Errorf("invalid size %v", size)
 	}
 	// approximate number of headers
-	return lowIQMapNewCount(blockHeaderSize / size)
+	return lowIQMapNewCount(size / blockHeaderSize)
 }

database/tbcd/level/level.go

@@ -161,9 +161,9 @@ func New(ctx context.Context, cfg *Config) (*ldb, error) {
 	if cfg.blockheaderCacheSize > 0 {
 		l.headerCache, err = lowIQMapNewSize(cfg.blockheaderCacheSize)
 		if err != nil {
+			panic(spew.Sdump(cfg))
 			return nil, fmt.Errorf("couldn't setup block header cache: %w", err)
 		}
-
 		log.Infof("blockheader cache: %v",
 			humanize.Bytes(uint64(cfg.blockheaderCacheSize)))
 	} else {
@@ -845,6 +845,10 @@ func (l *ldb) BlockHeadersRemove(ctx context.Context, bhs *wire.MsgHeaders, tipA
 		bhash := headersParsed[i].BlockHash()
 		fh := fullHeadersFromDb[i]
 		bhsBatch.Delete(bhash[:])
+		// Make batch
+		if l.cfg.blockheaderCacheSize > 0 {
+			l.headerCache.Purge(&bhash)
+		}
 
 		// Delete height mapping for header i
 		hhKey := heightHashToKey(fh.Height, bhash[:])

service/tbc/tbc.go

@@ -174,13 +174,6 @@ func NewServer(cfg *Config) (*Server, error) {
 	if cfg == nil {
 		cfg = NewDefaultConfig()
 	}
-	if cfg.BlockheaderCacheSize != "" {
-		var err error
-		cfg.blockheaderCacheSize, err = humanize.ParseBytes(cfg.BlockheaderCacheSize)
-		if err != nil {
-			return nil, fmt.Errorf("invalid blockheader cache size: %w", err)
-		}
-	}
 
 	if cfg.MempoolEnabled {
 		log.Infof("mempool forced disabled")

service/tbc/tbc_test.go

@@ -1054,7 +1054,7 @@ func createTbcServerExternalHeaderMode(ctx context.Context, t *testing.T) *Serve
 	cfg.ExternalHeaderMode = true
 	cfg.Network = networkLocalnet
 	cfg.BlockCache = 0
-	cfg.BlockheaderCacheSize = "1mb"
+	cfg.BlockheaderCacheSize = ""
 	cfg.MempoolEnabled = false
 
 	tbcServer, err := NewServer(cfg)