chore: remove all pre-nim-1.6 deadcode from codebase (#2857)

apps/chat2/chat2.nim

@@ -4,9 +4,6 @@
 when not (compileOption("threads")):
   {.fatal: "Please, compile this program with the --threads:on option!".}
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[strformat, strutils, times, options, random]

apps/chat2bridge/chat2bridge.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/liteprotocoltester/liteprotocoltester.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/liteprotocoltester/statistics.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/liteprotocoltester/tester_message.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/networkmonitor/networkmonitor.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/networkmonitor/networkmonitor_metrics.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/networkmonitor/networkmonitor_utils.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

apps/wakunode2/wakunode2.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

examples/wakustealthcommitments/erc_5564_interface.nim

@@ -1,7 +1,4 @@
 ## Nim wrappers for the functions defined in librln
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/results

examples/wakustealthcommitments/node_spec.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

examples/wakustealthcommitments/stealth_commitment_protocol.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

examples/wakustealthcommitments/wakustealthcommitments.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

tests/waku_rln_relay/test_rln_group_manager_onchain.nim

@@ -1,8 +1,5 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

tests/waku_rln_relay/test_rln_group_manager_static.nim

@@ -1,8 +1,5 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

tests/waku_rln_relay/test_rln_serde.nim

@@ -1,8 +1,5 @@
 {.used.}
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/common/base64.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/[results, byteutils, base64]

waku/common/confutils/envvar/defs.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import confutils/defs as confutilsDefs

waku/common/confutils/envvar/std/net.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[strutils, net]

waku/common/databases/db_postgres/pgasyncpool.nim

@@ -1,8 +1,5 @@
 # Simple async pool driver for postgress.
 # Inspired by: https://github.com/treeform/pg/
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[sequtils, nre, strformat, sets], stew/results, chronos

waku/common/enr/builder.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/common/enr/typed_record.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/common/envvar_serialization.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/shims/macros, serialization

waku/common/envvar_serialization/reader.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/common/envvar_serialization/utils.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[os, strutils], stew/byteutils, stew/ptrops

waku/common/hexstrings.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 type

waku/common/logging.nim

@@ -8,9 +8,6 @@ import
 
 export chronicles.LogLevel
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 type LogFormat* = enum

waku/common/nimchronos.nim

@@ -1,7 +1,4 @@
 ## An extension wrapper around nim-chronos
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronos, chronicles

waku/common/protobuf.nim

@@ -1,8 +1,5 @@
 # Extensions for libp2p's protobuf library implementation
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/options, libp2p/protobuf/minprotobuf, libp2p/varint

waku/common/ratelimit.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/options, chronos/timer, libp2p/stream/connection

waku/common/tokenbucket.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronos

waku/common/utils/matterbridge_client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[httpclient, json, uri, options], stew/results

waku/common/utils/nat.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[options, strutils, net]

waku/common/utils/sequence.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 proc flatten*[T](a: seq[seq[T]]): seq[T] =

waku/common/waku_service_metrics.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import metrics

waku/discovery/waku_discv5.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/discovery/waku_dnsdisc.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 ## A set of utilities to integrate EIP-1459 DNS-based discovery

waku/factory/builder.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/factory/networks_config.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 type ClusterConf* = object

waku/factory/validator_signed.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/factory/waku.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/config.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/health_monitor.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[options], chronos

waku/node/peer_manager/peer_manager.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/peer_manager/peer_store/migrations.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/[tables, strutils, os], stew/results, chronicles

waku/node/peer_manager/peer_store/peer_storage.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/results

waku/node/peer_manager/peer_store/waku_peer_storage.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/peer_manager/waku_peer_store.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/waku_metrics.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronicles, chronos, metrics, metrics/chronos_httpserver

waku/node/waku_node.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/node/waku_switch.nim

@@ -1,7 +1,4 @@
 # Waku Switch utils.
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/utils/collector.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import metrics

waku/utils/noise.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/results

waku/utils/requests.nim

@@ -1,8 +1,5 @@
 # Request utils.
 
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import bearssl/rand, stew/byteutils

waku/waku_api/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronos, std/[options, sequtils], stew/results

waku/waku_api/message_cache.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/admin/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/admin/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/admin/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/builder.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import net, tables

waku/waku_api/rest/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import presto/client

waku/waku_api/rest/debug/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/debug/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronicles, json_serialization, presto/route

waku/waku_api/rest/debug/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronicles, json_serialization, json_serialization/std/options

waku/waku_api/rest/filter/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/filter/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/filter/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/health/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/health/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronicles, json_serialization, presto/route

waku/waku_api/rest/health/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronicles, json_serialization, json_serialization/std/options

waku/waku_api/rest/legacy_store/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/legacy_store/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route

waku/waku_api/rest/legacy_store/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/lightpush/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/lightpush/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/lightpush/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/origin_handler.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/relay/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/relay/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/relay/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/responses.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/typetraits, stew/results, chronicles, presto/common

waku/waku_api/rest/rest_serdes.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/serdes.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/server.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/net

waku/waku_api/rest/store/client.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_api/rest/store/handlers.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/strformat, stew/results, chronicles, uri, json_serialization, presto/route

waku/waku_api/rest/store/types.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_archive/archive.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_archive/archive_metrics.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import metrics

waku/waku_archive/common.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/options, stew/results, stew/byteutils, stew/arrayops, nimcrypto/sha2

waku/waku_archive/driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/options, stew/results, chronos

waku/waku_archive/driver/builder.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/results, chronicles, chronos

waku/waku_archive/driver/postgres_driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_archive/driver/postgres_driver/postgres_driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import

waku/waku_archive/driver/postgres_driver/postgres_healthcheck.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import chronos, stew/results

waku/waku_archive/driver/queue_driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import ./queue_driver/queue_driver, ./queue_driver/index

waku/waku_archive/driver/queue_driver/index.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import stew/byteutils, nimcrypto/sha2

waku/waku_archive/driver/queue_driver/queue_driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import std/options, stew/results, stew/sorted_set, chronicles, chronos

waku/waku_archive/driver/sqlite_driver.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import ./sqlite_driver/sqlite_driver

waku/waku_archive/driver/sqlite_driver/cursor.nim

@@ -1,6 +1,3 @@
-when (NimMajor, NimMinor) < (1, 4):
-  {.push raises: [Defect].}
-else:
 {.push raises: [].}
 
 import ../../../waku_core, ../../common