fix compile-time hash, port to unittest2

stint.nimble

@@ -1,3 +1,5 @@
+mode = ScriptMode.Verbose
+
 packageName   = "stint"
 version       = "2.0.0"
 author        = "Status Research & Development GmbH"
@@ -8,7 +10,8 @@ skipDirs      = @["tests", "benchmarks"]
 
 # TODO test only requirements don't work: https://github.com/nim-lang/nimble/issues/482
 requires "nim >= 1.6.12",
-         "stew"
+         "stew",
+         "unittest2 >= 0.2.3"
 
 let nimc = getEnv("NIMC", "nim") # Which nim compiler to use
 let lang = getEnv("NIMLANG", "c") # Which backend (c/cpp/js)
@@ -35,7 +38,8 @@ proc run(args, path: string) =
 proc test(path: string) =
   for config in ["", "-d:stintNoIntrinsics"]:
     for mode in ["-d:debug", "-d:release"]:
-      run(config & " " & mode, path)
+      # Compile-time tests are done separately to speed up full testing
+      run(config & " " & mode & " -d:unittest2Static=false", path)
 
 task test_internal, "Run tests for internal procs":
   test "tests/internal"
@@ -47,5 +51,7 @@ task test, "Run all tests":
   test "tests/internal"
   test "tests/all_tests"
 
-  # Smoke-test wasm32 compiles
-  build "--cpu:wasm32 -c", "tests/all_tests"
+  # Run compile-time tests on both 32 and 64 bits
+  if lang == "c":
+    build "--cpu:amd64 -c -d:unittest2Static", "tests/all_tests"
+    build "--cpu:wasm32 -c -d:unittest2Static", "tests/all_tests"

stint/io.nim

@@ -35,7 +35,7 @@ template wordType*(_: type SomeBigInteger): type =
   Word
 
 template hash*(num: StUint|StInt): Hash =
-  mixin limbs
+  mixin hash, limbs
   hash(num.limbs)
 
 {.pop.}

tests/all_tests.nim

@@ -38,6 +38,6 @@ import
   test_bugfix,
   test_features
 
-when defined(cpp):
+when defined(cpp) and not defined(unittest2Static):
   import
     test_vs_intx

tests/config.nims

@@ -1 +1,2 @@
 switch("warning", "BareExcept:off")
+switch("define", "unittest2Static")

tests/internal_uint_div.nim

@@ -12,7 +12,7 @@
 {.used.}
 
 include ../stint/private/uint_div
-import unittest
+import unittest2
 
 suite "implementation of internal division procecures":
   test "Division of 2 words by 1 - specific carry case (issue #30)":

tests/t_randomized_divmod.nim

@@ -9,10 +9,11 @@
 
 import
   # Standard library
-  std/[unittest, times],
+  std/times,
   # Internal
   ../stint,
   # Test utilities
+  unittest2,
   ../helpers/prng_unsafe
 
 const Iters = 50000
@@ -35,7 +36,7 @@ proc test_divmod(bits: static int, iters: int, gen: RandomGen) =
       doAssert b.isZero()
 
 template test(bits: static int) =
-  test "(q, r) = divmod(a, b) <=> a = q*b + r (" & $bits & " bits)":
+  runtimeTest "(q, r) = divmod(a, b) <=> a = q*b + r (" & $bits & " bits)":
     test_divmod(bits, Iters, Uniform)
     test_divmod(bits, Iters, HighHammingWeight)
     test_divmod(bits, Iters, Long01Sequence)

tests/t_randomized_vs_gmp.nim

@@ -1,14 +1,14 @@
 # Stint
 # Copyright (c) 2018-2022    Status Research & Development GmbH
-# 
+#
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at http://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at http://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
   # Standard library
-  std/[unittest, times, strutils],
+  std/[unittest2, times, strutils],
   # Third-party
   gmp, stew/byteutils,
   # Internal
@@ -50,7 +50,7 @@ proc fromStuint[bits: static int](dst: var mpz_t, src: Stuint[bits]) =
   doAssert t2.toOpenArray(0, wordsWritten-1) == t.toOpenArray(t.len-wordsWritten, t.len-1)
 
 proc test_add(bits: static int, iters: int, gen: RandomGen) =
-  
+
   const N = (bits + 7) div 8
 
   var x, y, z, m: mpz_t
@@ -59,7 +59,7 @@ proc test_add(bits: static int, iters: int, gen: RandomGen) =
   mpz_init(z)
   mpz_init(m)
   mpz_ui_pow_ui(m, 2, bits) # 2^bits
-  
+
   for _ in 0 ..< iters:
     let a = rng.random_elem(Stuint[bits], gen)
     let b = rng.random_elem(Stuint[bits], gen)
@@ -97,7 +97,7 @@ template testAddition(bits: static int) =
     test_add(bits, Iters, Long01Sequence)
 
 proc test_sub(bits: static int, iters: int, gen: RandomGen) =
-  
+
   const N = (bits + 7) div 8
 
   var x, y, z, m: mpz_t
@@ -106,7 +106,7 @@ proc test_sub(bits: static int, iters: int, gen: RandomGen) =
   mpz_init(z)
   mpz_init(m)
   mpz_ui_pow_ui(m, 2, bits) # 2^bits
-  
+
   for _ in 0 ..< iters:
     let a = rng.random_elem(Stuint[bits], gen)
     let b = rng.random_elem(Stuint[bits], gen)
@@ -144,7 +144,7 @@ template testSubstraction(bits: static int) =
     test_sub(bits, Iters, Long01Sequence)
 
 proc test_mul(bits: static int, iters: int, gen: RandomGen) =
-  
+
   const N = (bits + 7) div 8
 
   var x, y, z, m: mpz_t
@@ -153,7 +153,7 @@ proc test_mul(bits: static int, iters: int, gen: RandomGen) =
   mpz_init(z)
   mpz_init(m)
   mpz_ui_pow_ui(m, 2, bits) # 2^bits
-  
+
   for _ in 0 ..< iters:
     let a = rng.random_elem(Stuint[bits], gen)
     let b = rng.random_elem(Stuint[bits], gen)

tests/test_bugfix.nim

@@ -6,15 +6,15 @@
 #
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-import ../stint, unittest
+import ../stint, unittest2
 
 suite "various bugfix":
   test "skipPrefixes bug":
     let x = "0b1010101".parse(UInt128, 2)
     let z = "0bcdef12345".parse(UInt128, 16)
-    
+
     check x == 0b1010101.u128
     check z == 0x0bcdef12345.u128
-    
+
     expect(AssertionDefect):
       discard "0bcdef12345".parse(UInt128, 10)