diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2e41d4..f312dce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,6 @@ jobs: restore-keys: | ${{ runner.os }}-${{ env.cache_nonce }}- - - name: Install dependencies - shell: bash - run: nimble -y install -l - - name: Nimble Test shell: bash run: nimble test diff --git a/ls.nim b/ls.nim index caf122a..2305f05 100644 --- a/ls.nim +++ b/ls.nim @@ -25,6 +25,9 @@ import chronos/asyncproc, stew/byteutils +chronicles.formatIt(JsonNode): + $it + proc getVersionFromNimble(): string = #We should static run nimble dump instead const content = staticRead("nimlangserver.nimble") diff --git a/nim.cfg b/nim.cfg index 599f653..8350c8b 100644 --- a/nim.cfg +++ b/nim.cfg @@ -1,13 +1,10 @@ --threads:on ---define:"async_backend=asyncdispatch" --define:"chronicles_default_output_device=stderr" ---define:"chronicles_colors=None" ---define:"chronicles_disable_thread_id" +--define:"chronicles_thread_ids=no" --define:"debugLogging" #--define:"chronicles_log_level=TRACE" --define:"chronicles_log_level=DEBUG" --define:"chronicles_timestamps=None" ---define:"asyncBackend=none" --warning[deprecated]:off #--define:"chronicles_sinks=textlines[file]" diff --git a/nimble.lock b/nimble.lock index 3a96b30..ee1ee2c 100644 --- a/nimble.lock +++ b/nimble.lock @@ -1,38 +1,52 @@ { "version": 2, "packages": { + "nim": { + "version": "2.0.8", + "vcsRevision": "28021a6356119aad32a00815e1dc63b934c5cb40", + "url": "https://github.com/nim-lang/Nim.git", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "83c1d893cb997417565b7208e3cbebb8f93222cb" + } + }, "unittest2": { - "version": "0.2.4", - "vcsRevision": "8b51e99b4a57fcfb31689230e75595f024543024", + "version": "0.2.5", + "vcsRevision": "26f2ef3ae0ec72a2a75bfe557e02e88f6a31c189", "url": "https://github.com/status-im/nim-unittest2", "downloadMethod": "git", - "dependencies": [], + "dependencies": [ + "nim" + ], "checksums": { - "sha1": "746106a4dfefffce497f1693733f1c1513b5c62c" + "sha1": "02bb3751ba9ddc3c17bfd89f2e41cb6bfb8fc0c9" } }, "bearssl": { - "version": "0.2.5", - "vcsRevision": "667b40440a53a58e9f922e29e20818720c62d9ac", + "version": "0.2.6", + "vcsRevision": "11e798b62b8e6beabe958e048e9e24c7e0f9ee63", "url": "https://github.com/status-im/nim-bearssl", "downloadMethod": "git", "dependencies": [ + "nim", "unittest2" ], "checksums": { - "sha1": "550e6f9321b85de53bba9c0ffab9c95ffbe12ab3" + "sha1": "7e068f119664cf47ad0cfb74ef4c56fb6b616523" } }, "testutils": { - "version": "0.5.3", - "vcsRevision": "4d37244f9f5e1acd8592a4ceb5c3fc47bc160181", + "version": "0.8.0", + "vcsRevision": "e4d37dc1652d5c63afb89907efb5a5e812261797", "url": "https://github.com/status-im/nim-testutils", "downloadMethod": "git", "dependencies": [ + "nim", "unittest2" ], "checksums": { - "sha1": "2841517f3891ab396cb78d98d46ffd2551176f4b" + "sha1": "d1678f50aa47d113b4e77d41eec2190830b523fa" } }, "results": { @@ -40,63 +54,116 @@ "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27", "url": "https://github.com/arnetheduck/nim-results", "downloadMethod": "git", - "dependencies": [], + "dependencies": [ + "nim" + ], "checksums": { "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7" } }, "stew": { - "version": "0.2.0", - "vcsRevision": "79e4fa5a9d3374db17ed63622714d3e1094c7f34", + "version": "0.4.2", + "vcsRevision": "b66168735d6f3841c5239c3169d3fe5fe98b1257", "url": "https://github.com/status-im/nim-stew", "downloadMethod": "git", "dependencies": [ + "nim", "results", "unittest2" ], "checksums": { - "sha1": "26d477c735913b7daa1dab53dd74803c88209634" + "sha1": "928e82cb8d2f554e8f10feb2349ee9c32fee3a8c" + } + }, + "zlib": { + "version": "0.1.0", + "vcsRevision": "3f7998095264d262a8d99e2be89045e6d9301537", + "url": "https://github.com/status-im/nim-zlib", + "downloadMethod": "git", + "dependencies": [ + "nim", + "stew", + "results" + ], + "checksums": { + "sha1": "7033fe964f174dccd20dcbd71a8150e30e5651fb" + } + }, + "httputils": { + "version": "0.4.0", + "vcsRevision": "c53852d9e24205b6363bba517fa8ee7bde823691", + "url": "https://github.com/status-im/nim-http-utils", + "downloadMethod": "git", + "dependencies": [ + "nim", + "stew", + "results", + "unittest2" + ], + "checksums": { + "sha1": "298bc5b6fe4e5aa9c3b7e2ebfa17191675020f10" + } + }, + "chronos": { + "version": "4.0.4", + "vcsRevision": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655", + "url": "https://github.com/status-im/nim-chronos", + "downloadMethod": "git", + "dependencies": [ + "nim", + "results", + "stew", + "bearssl", + "httputils", + "unittest2" + ], + "checksums": { + "sha1": "455802a90204d8ad6b31d53f2efff8ebfe4c834a" } }, "faststreams": { - "version": "0.3.0", - "vcsRevision": "2b08c774afaafd600cf4c6f994cf78b8aa090c0c", + "version": "0.5.0", + "vcsRevision": "ce27581a3e881f782f482cb66dc5b07a02bd615e", "url": "https://github.com/status-im/nim-faststreams", "downloadMethod": "git", "dependencies": [ + "nim", "stew", "unittest2" ], "checksums": { - "sha1": "ec2d92793e7d1bd0c30ab29c0d20548a054cfa8e" + "sha1": "ee61e507b805ae1df7ec936f03f2d101b0d72383" } }, "serialization": { - "version": "0.2.6", - "vcsRevision": "2086c99608b4bf472e1ef5fe063710f280243396", + "version": "0.5.2", + "vcsRevision": "b0f2fa32960ea532a184394b0f27be37bd80248b", "url": "https://github.com/status-im/nim-serialization", "downloadMethod": "git", "dependencies": [ + "nim", "faststreams", "unittest2", "stew" ], "checksums": { - "sha1": "26deca68e1a027be90e2bf2856e25aa819101d1e" + "sha1": "fa35c1bb76a0a02a2379fe86eaae0957c7527cb8" } }, "json_serialization": { - "version": "0.2.9", - "vcsRevision": "6eadb6e939ffa7882ff5437033c11a9464d3385c", + "version": "0.4.4", + "vcsRevision": "c343b0e243d9e17e2c40f3a8a24340f7c4a71d44", "url": "https://github.com/status-im/nim-json-serialization", "downloadMethod": "git", "dependencies": [ + "nim", + "faststreams", "serialization", "stew", "results" ], "checksums": { - "sha1": "4062dc791d268930701bdef55b5cc35f82303ad3" + "sha1": "8b3115354104858a0ac9019356fb29720529c2bd" } }, "chronicles": { @@ -105,6 +172,7 @@ "url": "https://github.com/status-im/nim-chronicles", "downloadMethod": "git", "dependencies": [ + "nim", "testutils", "json_serialization" ], @@ -112,95 +180,96 @@ "sha1": "79f09526d4d9b9196dd2f6a75310d71a890c4f88" } }, - "httputils": { - "version": "0.3.0", - "vcsRevision": "79cbab1460f4c0cdde2084589d017c43a3d7b4f1", - "url": "https://github.com/status-im/nim-http-utils", + "stint": { + "version": "0.8.2", + "vcsRevision": "470b7892561b5179ab20bd389a69217d6213fe58", + "url": "https://github.com/status-im/nim-stint", "downloadMethod": "git", "dependencies": [ + "nim", "stew", - "results", "unittest2" ], "checksums": { - "sha1": "cd92ac3eaa067eb641429d4325d926bc0f7786a9" + "sha1": "d8f871fd617e7857192d4609fe003b48942a8ae5" } }, - "chronos": { - "version": "4.0.4", - "vcsRevision": "0646c444fce7c7ed08ef6f2c9a7abfd172ffe655", - "url": "https://github.com/status-im/nim-chronos", + "unicodedb": { + "version": "0.13.2", + "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561", + "url": "https://github.com/nitely/nim-unicodedb", "downloadMethod": "git", "dependencies": [ - "results", - "stew", - "bearssl", - "httputils", - "unittest2" + "nim" ], "checksums": { - "sha1": "455802a90204d8ad6b31d53f2efff8ebfe4c834a" + "sha1": "739102d885d99bb4571b1955f5f12aee423c935b" } }, - "nimcrypto": { - "version": "0.6.2", - "vcsRevision": "dc07e3058c6904eef965394493b6ea99aa2adefc", - "url": "https://github.com/cheatfate/nimcrypto", + "regex": { + "version": "0.26.3", + "vcsRevision": "4593305ed1e49731fc75af1dc572dd2559aad19c", + "url": "https://github.com/nitely/nim-regex", "downloadMethod": "git", - "dependencies": [], + "dependencies": [ + "nim", + "unicodedb" + ], "checksums": { - "sha1": "8e3e42530f54c8c312942a89640b7e0f687f33a5" + "sha1": "4d24e7d7441137cd202e16f2359a5807ddbdc31f" } }, - "stint": { - "version": "0.8.1", - "vcsRevision": "1a2c661e3f50ff696b0b6692fab0d7bb2abf10cc", - "url": "https://github.com/status-im/nim-stint", + "with": { + "version": "0.5.0", + "vcsRevision": "bd36a44410dd8365649e425ccade817178628e12", + "url": "https://github.com/zevv/with", "downloadMethod": "git", "dependencies": [ - "stew", - "unittest2" + "nim" ], "checksums": { - "sha1": "fe3c8b7b0484135294b8fb3dab5b1a030a08bddc" + "sha1": "a3de696c9fa0c941646414d9ad28ef3afdcb8a9e" } }, - "zlib": { - "version": "0.1.0", - "vcsRevision": "3f7998095264d262a8d99e2be89045e6d9301537", - "url": "https://github.com/status-im/nim-zlib", + "nimcrypto": { + "version": "0.7.3", + "vcsRevision": "b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08", + "url": "https://github.com/cheatfate/nimcrypto", "downloadMethod": "git", "dependencies": [ - "stew" + "nim" ], "checksums": { - "sha1": "7033fe964f174dccd20dcbd71a8150e30e5651fb" + "sha1": "f72b90fe3f4da09efa482de4f8729e7ee4abea2f" } }, "websock": { - "version": "0.2.0", - "vcsRevision": "ebe308a79a7b440a11dfbe74f352be86a3883508", + "version": "0.2.1", + "vcsRevision": "35ae76f1559e835c80f9c1a3943bf995d3dd9eb5", "url": "https://github.com/status-im/nim-websock", "downloadMethod": "git", "dependencies": [ + "nim", "chronos", "httputils", "chronicles", "stew", "nimcrypto", "bearssl", + "results", "zlib" ], "checksums": { - "sha1": "614476e24cad4fe27ee05d29c2b7ea3e4674e3c2" + "sha1": "1cb5efa10cd389bc01d0707c242ae010c76a03cd" } }, "json_rpc": { - "version": "0.5.0", - "vcsRevision": "274372132de497e6b7b793c9d5d5474b71bf80a2", + "version": "0.5.4", + "vcsRevision": "b6e40a776fa2d00b97a9366761fb7da18f31ae5c", "url": "https://github.com/status-im/nim-json-rpc", "downloadMethod": "git", "dependencies": [ + "nim", "stew", "nimcrypto", "stint", @@ -208,53 +277,12 @@ "httputils", "chronicles", "websock", + "serialization", "json_serialization", "unittest2" ], "checksums": { - "sha1": "76693d36bc04ba10ec74422011805484969940d3" - } - }, - "nim": { - "version": "2.0.8", - "vcsRevision": "5935c3bfa9fec6505394867b23510eb5cbab3dbf", - "url": "https://github.com/nim-lang/Nim.git", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "46333e8f4bda41dd6d3852a3f5fa4975b96b66a2" - } - }, - "unicodedb": { - "version": "0.13.2", - "vcsRevision": "66f2458710dc641dd4640368f9483c8a0ec70561", - "url": "https://github.com/nitely/nim-unicodedb", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "739102d885d99bb4571b1955f5f12aee423c935b" - } - }, - "regex": { - "version": "0.26.1", - "vcsRevision": "0673df07cb266e15942c3b5f5b8a4732f049cd73", - "url": "https://github.com/nitely/nim-regex", - "downloadMethod": "git", - "dependencies": [ - "unicodedb" - ], - "checksums": { - "sha1": "1ec6f54553401e3f435b21fbf9a00c6cb376a027" - } - }, - "with": { - "version": "0.5.0", - "vcsRevision": "bd36a44410dd8365649e425ccade817178628e12", - "url": "https://github.com/zevv/with", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "a3de696c9fa0c941646414d9ad28ef3afdcb8a9e" + "sha1": "d8e8be795fcf098f4ce03b5826f6b3153f6a6e07" } } }, diff --git a/tests/all.nim.cfg b/tests/all.nim.cfg deleted file mode 100644 index 8d438f4..0000000 --- a/tests/all.nim.cfg +++ /dev/null @@ -1,8 +0,0 @@ ---threads:on ---define:"async_backend=asyncdispatch" ---define:"chronicles_default_output_device=stderr" ---define:"chronicles_colors=None" ---define:"chronicles_disable_thread_id" ---define:"debugLogging" ---define:"chronicles_log_level=DEBUG" ---define:"chronicles_timestamps=None" diff --git a/tests/config.nims b/tests/config.nims deleted file mode 100644 index c5ed280..0000000 --- a/tests/config.nims +++ /dev/null @@ -1,9 +0,0 @@ ---hints: off ---debuginfo ---threads:on ---define:"debugLogging=on" ---define:"chronicles_disable_thread_id" ---define:"async_backend=asyncdispatch" ---define:"chronicles_timestamps=None" ---define:"debugLogging" ---define:"test" diff --git a/tests/nim.cfg b/tests/nim.cfg new file mode 100644 index 0000000..15e42d1 --- /dev/null +++ b/tests/nim.cfg @@ -0,0 +1 @@ +--debuginfo