Abstraction of cache and context

core/tests/test_apps.bitcoin.approver.py

@@ -1,6 +1,6 @@
 from common import H_, await_result, unittest  # isort:skip
 
-import storage.cache
+import storage.cache_codec
 from trezor import wire
 from trezor.crypto import bip32
 from trezor.enums import InputScriptType, OutputScriptType
@@ -11,6 +11,8 @@
     TxInput,
     TxOutput,
 )
+from trezor.wire import context
+from trezor.wire.codec.codec_context import CodecContext
 
 from apps.bitcoin.authorization import FEE_RATE_DECIMALS, CoinJoinAuthorization
 from apps.bitcoin.sign_tx.approvers import CoinJoinApprover
@@ -20,6 +22,11 @@
 
 
 class TestApprover(unittest.TestCase):
+
+    def __init__(self):
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     def setUp(self):
         self.coin = coins.by_name("Bitcoin")
         self.fee_rate_percent = 0.3
@@ -47,7 +54,7 @@ def setUp(self):
             coin_name=self.coin.coin_name,
             script_type=InputScriptType.SPENDTAPROOT,
         )
-        storage.cache.start_session()
+        storage.cache_codec.start_session()
 
     def make_coinjoin_request(self, inputs):
         return CoinJoinRequest(

core/tests/test_apps.bitcoin.authorization.py

@@ -1,8 +1,10 @@
 from common import H_, unittest  # isort:skip
 
-import storage.cache
+import storage.cache_codec
 from trezor.enums import InputScriptType
 from trezor.messages import AuthorizeCoinJoin, GetOwnershipProof, SignTx
+from trezor.wire import context
+from trezor.wire.codec.codec_context import CodecContext
 
 from apps.bitcoin.authorization import CoinJoinAuthorization
 from apps.common import coins
@@ -12,6 +14,10 @@
 
 class TestAuthorization(unittest.TestCase):
 
+    def __init__(self):
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     coin = coins.by_name("Bitcoin")
 
     def setUp(self):
@@ -26,7 +32,7 @@ def setUp(self):
         )
 
         self.authorization = CoinJoinAuthorization(self.msg_auth)
-        storage.cache.start_session()
+        storage.cache_codec.start_session()
 
     def test_ownership_proof_account_depth_mismatch(self):
         # Account depth mismatch.

core/tests/test_apps.bitcoin.keychain.py

@@ -1,17 +1,25 @@
 from common import *  # isort:skip
 
-from storage import cache
+from storage import cache_common
 from trezor import wire
 from trezor.crypto import bip39
+from trezor.wire import context
 
 from apps.bitcoin.keychain import _get_coin_by_name, _get_keychain_for_coin
+from trezor.wire.codec.codec_context import CodecContext
+from storage import cache_codec
 
 
 class TestBitcoinKeychain(unittest.TestCase):
+
+    def __init__(self):
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     def setUp(self):
-        cache.start_session()
+        cache_codec.start_session()
         seed = bip39.seed(" ".join(["all"] * 12), "")
-        cache.set(cache.APP_COMMON_SEED, seed)
+        cache_codec.get_active_session().set(cache_common.APP_COMMON_SEED, seed)
 
     def test_bitcoin(self):
         coin = _get_coin_by_name("Bitcoin")
@@ -88,10 +96,19 @@ def test_unknown(self):
 
 @unittest.skipUnless(not utils.BITCOIN_ONLY, "altcoin")
 class TestAltcoinKeychains(unittest.TestCase):
+
+    def __init__(self):
+        # Context is needed to test decorators and handleInitialize
+        # It allows access to codec cache from different parts of the code
+        from trezor.wire import context
+
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     def setUp(self):
-        cache.start_session()
+        cache_codec.start_session()
         seed = bip39.seed(" ".join(["all"] * 12), "")
-        cache.set(cache.APP_COMMON_SEED, seed)
+        cache_codec.get_active_session().set(cache_common.APP_COMMON_SEED, seed)
 
     def test_bcash(self):
         coin = _get_coin_by_name("Bcash")

core/tests/test_apps.common.keychain.py

@@ -1,19 +1,27 @@
 from common import *  # isort:skip
 
 from mock_storage import mock_storage
-from storage import cache
+from storage import cache, cache_common
 from trezor import wire
 from trezor.crypto import bip39
 from trezor.enums import SafetyCheckLevel
+from trezor.wire import context
 
 from apps.common import safety_checks
 from apps.common.keychain import Keychain, LRUCache, get_keychain, with_slip44_keychain
 from apps.common.paths import PATTERN_SEP5, PathSchema
+from trezor.wire.codec.codec_context import CodecContext
+from storage import cache_codec
 
 
 class TestKeychain(unittest.TestCase):
+
+    def __init__(self):
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     def setUp(self):
-        cache.start_session()
+        cache_codec.start_session()
 
     def tearDown(self):
         cache.clear_all()
@@ -71,7 +79,7 @@ def test_no_schemas(self):
 
     def test_get_keychain(self):
         seed = bip39.seed(" ".join(["all"] * 12), "")
-        cache.set(cache.APP_COMMON_SEED, seed)
+        context.cache_set(cache_common.APP_COMMON_SEED, seed)
 
         schema = PathSchema.parse("m/44'/1'", 0)
         keychain = await_result(get_keychain("secp256k1", [schema]))
@@ -85,7 +93,7 @@ def test_get_keychain(self):
 
     def test_with_slip44(self):
         seed = bip39.seed(" ".join(["all"] * 12), "")
-        cache.set(cache.APP_COMMON_SEED, seed)
+        context.cache_set(cache_common.APP_COMMON_SEED, seed)
 
         slip44_id = 42
         valid_path = [H_(44), H_(slip44_id), H_(0)]

core/tests/test_apps.ethereum.keychain.py

@@ -2,12 +2,15 @@
 
 import unittest
 
-from storage import cache
-from trezor import utils, wire
+from storage import cache_common
+from trezor import wire
 from trezor.crypto import bip39
+from trezor.wire import context
 
 from apps.common.keychain import get_keychain
 from apps.common.paths import HARDENED
+from trezor.wire.codec.codec_context import CodecContext
+from storage import cache_codec
 
 if not utils.BITCOIN_ONLY:
     from ethereum_common import encode_network, make_network
@@ -71,10 +74,14 @@ def _check_keychain(self, keychain, slip44_id):
                 addr,
             )
 
+    def __init__(self):
+        context.CURRENT_CONTEXT = CodecContext(None, bytearray(64))
+        super().__init__()
+
     def setUp(self):
-        cache.start_session()
+        cache_codec.start_session()
         seed = bip39.seed(" ".join(["all"] * 12), "")
-        cache.set(cache.APP_COMMON_SEED, seed)
+        cache_codec.get_active_session().set(cache_common.APP_COMMON_SEED, seed)
 
     def from_address_n(self, address_n):
         slip44 = _slip44_from_address_n(address_n)