File size: 2,980 Bytes
5980447 |
1 2 |
{"repo": "ethereum/py-evm", "pull_number": 527, "instance_id": "ethereum__py-evm-527", "issue_numbers": "", "base_commit": "3f42b6dcf794d7200118e85e8251e4c17f2bca1c", "patch": "diff --git a/evm/db/backends/base.py b/evm/db/backends/base.py\n--- a/evm/db/backends/base.py\n+++ b/evm/db/backends/base.py\n@@ -8,6 +8,10 @@ class BaseDB(metaclass=ABCMeta):\n \n @abstractmethod\n def get(self, key):\n+ \"\"\"Return the value for the given key.\n+\n+ Raises KeyError if key doesn't exist.\n+ \"\"\"\n raise NotImplementedError(\n \"The `get` method must be implemented by subclasses of BaseDB\"\n )\n@@ -20,6 +24,7 @@ def set(self, key, value):\n \n @abstractmethod\n def exists(self, key):\n+ \"\"\"Return True if the key exists or False if it doesn't.\"\"\"\n raise NotImplementedError(\n \"The `exists` method must be implemented by subclasses of BaseDB\"\n )\ndiff --git a/evm/db/backends/level.py b/evm/db/backends/level.py\n--- a/evm/db/backends/level.py\n+++ b/evm/db/backends/level.py\n@@ -10,23 +10,24 @@ def __init__(self, db_path=None):\n if not db_path:\n raise TypeError(\"Please specifiy a valid path for your database.\")\n try:\n- import leveldb\n+ import plyvel\n except ImportError:\n- raise ImportError(\"LevelDB requires the leveldb \\\n+ raise ImportError(\"LevelDB requires the plyvel \\\n library which is not available for import.\")\n self.db_path = db_path\n- self.db = leveldb.LevelDB(db_path, create_if_missing=True, error_if_exists=False)\n+ self.db = plyvel.DB(db_path, create_if_missing=True, error_if_exists=False)\n \n def get(self, key):\n- # 'Get' Returns a bytearray which needs to be converted to straight bytes\n- return bytes(self.db.Get(key))\n+ v = self.db.get(key)\n+ if v is None:\n+ raise KeyError(key)\n+ return v\n \n def set(self, key, value):\n- self.db.Put(key, value)\n+ self.db.put(key, value)\n \n- # Returns False instead of KeyError if key doesn't exist\n def exists(self, key):\n- return bool(self.db.Get(key, default=False))\n+ return self.db.get(key) is not None\n \n def delete(self, key):\n- self.db.Delete(key)\n+ self.db.delete(key)\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -34,10 +34,10 @@\n \"coincurve>=7.0.0,<8.0.0\",\n ],\n 'leveldb': [\n- \"leveldb>=0.194,<1.0.0\",\n+ \"plyvel==1.0.4\",\n ],\n 'trinity': [\n- \"leveldb>=0.194,<1.0.0\",\n+ \"plyvel==1.0.4\",\n \"coincurve>=7.0.0,<8.0.0\",\n \"web3>=4.0.0b11,<5.0.0\",\n ],\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2018-04-03T11:01:52Z"}
|