From 41ffbc4049cd6de30205629f90d9c443fcea12cd Mon Sep 17 00:00:00 2001 From: mratsim Date: Wed, 11 Apr 2018 17:12:28 +0200 Subject: [PATCH] Rebase --- nimbus.nimble | 3 ++- src/db/state_db.nim | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nimbus.nimble b/nimbus.nimble index 2fa6bc64d..bb18095a5 100644 --- a/nimbus.nimble +++ b/nimbus.nimble @@ -9,7 +9,8 @@ skipDirs = @["tests"] requires "nim >= 0.18.1", "https://github.com/cheatfate/nimcrypto#master", - "https://github.com/alehander42/nim-rlp#fix-ordinal", #TODO switching to the Status repo throws: "Error: undeclared identifier: 'Range'" + "https://github.com/status-im/nim-rlp", + "https://github.com/status-im/nim-ranges", "https://github.com/status-im/nim-ttmath#master" proc test(name: string, lang = "cpp") = diff --git a/src/db/state_db.nim b/src/db/state_db.nim index 474403bd3..30fb8a086 100644 --- a/src/db/state_db.nim +++ b/src/db/state_db.nim @@ -7,7 +7,8 @@ import strformat, tables, - ../constants, ../errors, ../validation, ../account, ../logging, ../utils_numeric, .. / utils / [padding, bytes, keccak], ttmath, rlp + ../constants, ../errors, ../validation, ../account, ../logging, ../utils_numeric, .. / utils / [padding, bytes, keccak], + ttmath, rlp, ranges type AccountStateDB* = ref object