diff --git a/codex/conf.nim b/codex/conf.nim index aedc4879..ed23d6c2 100644 --- a/codex/conf.nim +++ b/codex/conf.nim @@ -32,7 +32,7 @@ import pkg/ethers import ./discovery import ./stores -import ./consts +import ./stores/consts export DefaultCacheSizeMiB, net, DefaultQuotaBytes, DefaultBlockTtl, DefaultBlockMaintenanceInterval, DefaultNumberOfBlocksToMaintainPerInterval, RepoKind diff --git a/codex/consts.nim b/codex/consts.nim deleted file mode 100644 index c2b547ba..00000000 --- a/codex/consts.nim +++ /dev/null @@ -1,8 +0,0 @@ - -type - RepoKind* = enum - repoFS = "fs" - repoSQLite = "sqlite" - -const - MiB* = 1024 * 1024 diff --git a/codex/stores/blockstoremanager.nim b/codex/stores/blockstoremanager.nim index 62520176..936656e4 100644 --- a/codex/stores/blockstoremanager.nim +++ b/codex/stores/blockstoremanager.nim @@ -15,7 +15,7 @@ import pkg/confutils import pkg/confutils/defs import ../namespaces -import ../consts +import ./consts import ./blockstore import ./repostore import ./cachestore diff --git a/codex/stores/cachestore.nim b/codex/stores/cachestore.nim index d7251520..59066af2 100644 --- a/codex/stores/cachestore.nim +++ b/codex/stores/cachestore.nim @@ -21,7 +21,7 @@ import pkg/questionable import pkg/questionable/results import ./blockstore -import ../consts +import ./consts import ../chunker import ../manifest @@ -35,10 +35,6 @@ type backingStore: BlockStore cache: LruCache[Cid, Block] -const - DefaultCacheSizeMiB* = 5 - DefaultCacheSize* = DefaultCacheSizeMiB * MiB - method getBlock*(self: CacheStore, cid: Cid): Future[?!Block] {.async.} = if cid.isEmpty: trace "Empty block, ignoring" diff --git a/codex/stores/consts.nim b/codex/stores/consts.nim new file mode 100644 index 00000000..daec0aab --- /dev/null +++ b/codex/stores/consts.nim @@ -0,0 +1,17 @@ +import pkg/chronos + +type + RepoKind* = enum + repoFS = "fs" + repoSQLite = "sqlite" + +const + MiB* = 1024 * 1024 + DefaultCacheSizeMiB* = 5 + DefaultCacheSize* = DefaultCacheSizeMiB * MiB + DefaultBlockMaintenanceInterval* = 10.minutes + DefaultNumberOfBlocksToMaintainPerInterval* = 1000 + DefaultMemoryStoreCapacityMiB* = 5 + DefaultMemoryStoreCapacity* = DefaultMemoryStoreCapacityMiB * MiB + DefaultBlockTtl* = 24.hours + DefaultQuotaBytes* = 1'u shl 33'u # ~8GB diff --git a/codex/stores/maintenance.nim b/codex/stores/maintenance.nim index e12edb84..e30dca4a 100644 --- a/codex/stores/maintenance.nim +++ b/codex/stores/maintenance.nim @@ -20,10 +20,6 @@ import ../utils/timer import ../clock import ../systemclock -const - DefaultBlockMaintenanceInterval* = 10.minutes - DefaultNumberOfBlocksToMaintainPerInterval* = 1000 - type BlockMaintainer* = ref object of RootObj repoStore: RepoStore diff --git a/codex/stores/memorystore.nim b/codex/stores/memorystore.nim index e42aa7ad..b89b36d6 100644 --- a/codex/stores/memorystore.nim +++ b/codex/stores/memorystore.nim @@ -22,7 +22,7 @@ import pkg/questionable import pkg/questionable/results import ./blockstore -import ../consts +import ./consts import ../chunker import ../manifest @@ -42,10 +42,6 @@ type table: Table[Cid, DoublyLinkedNode[MemoryStoreNode]] list: DoublyLinkedList[MemoryStoreNode] -const - DefaultMemoryStoreCapacityMiB* = 5 - DefaultMemoryStoreCapacity* = DefaultMemoryStoreCapacityMiB * MiB - method getBlock*(self: MemoryStore, cid: Cid): Future[?!Block] {.async.} = trace "Getting block from cache", cid if cid.isEmpty: diff --git a/codex/stores/repostore.nim b/codex/stores/repostore.nim index bc2b3798..b59bc53a 100644 --- a/codex/stores/repostore.nim +++ b/codex/stores/repostore.nim @@ -21,6 +21,7 @@ import pkg/stew/endians2 import ./blockstore import ./keyutils +import ./consts import ../blocktype import ../clock import ../systemclock @@ -30,10 +31,6 @@ export blocktype, libp2p logScope: topics = "codex repostore" -const - DefaultBlockTtl* = 24.hours - DefaultQuotaBytes* = 1'u shl 33'u # ~8GB - type QuotaUsedError* = object of CodexError QuotaNotEnoughError* = object of CodexError diff --git a/tests/codex/stores/testrepostore.nim b/tests/codex/stores/testrepostore.nim index 49a4b892..0429e1da 100644 --- a/tests/codex/stores/testrepostore.nim +++ b/tests/codex/stores/testrepostore.nim @@ -11,9 +11,9 @@ import pkg/libp2p import pkg/stew/endians2 import pkg/datastore -import pkg/codex/stores/cachestore import pkg/codex/chunker import pkg/codex/stores +import pkg/codex/stores/consts import pkg/codex/blocktype as bt import pkg/codex/clock