Browse Source

util.py: relocate write_mode() decorator to tw/ctl.py

The MMGen Project 2 years ago
parent
commit
59e1bd0829
4 changed files with 15 additions and 16 deletions
  1. 2 2
      mmgen/proto/btc/tw/ctl.py
  2. 2 2
      mmgen/proto/eth/tw/ctl.py
  3. 11 1
      mmgen/tw/ctl.py
  4. 0 11
      mmgen/util.py

+ 2 - 2
mmgen/proto/btc/tw/ctl.py

@@ -13,8 +13,8 @@ proto.btc.twctl: Bitcoin base protocol tracking wallet control class
 """
 
 from ....globalvars import g
-from ....tw.ctl import TrackingWallet
-from ....util import msg,msg_r,rmsg,vmsg,die,suf,fmt_list,write_mode
+from ....tw.ctl import TrackingWallet,write_mode
+from ....util import msg,msg_r,rmsg,vmsg,die,suf,fmt_list
 
 class BitcoinTrackingWallet(TrackingWallet):
 

+ 2 - 2
mmgen/proto/eth/tw/ctl.py

@@ -20,8 +20,8 @@
 proto.eth.twctl: Ethereum tracking wallet control class
 """
 
-from ....util import msg,ymsg,write_mode,die
-from ....tw.ctl import TrackingWallet
+from ....util import msg,ymsg,die
+from ....tw.ctl import TrackingWallet,write_mode
 from ....addr import is_coin_addr,is_mmgen_id
 from ....amt import ETHAmt
 from ..contract import Token,TokenResolve

+ 11 - 1
mmgen/tw/ctl.py

@@ -30,7 +30,6 @@ from ..util import (
 	qmsg,
 	dmsg,
 	suf,
-	write_mode,
 	die )
 from ..base_obj import AsyncInit
 from ..objmethods import MMGenObject
@@ -39,6 +38,17 @@ from ..addr import CoinAddr,is_mmgen_id,is_coin_addr
 from ..rpc import rpc_init
 from .common import TwMMGenID,TwLabel
 
+# decorator for TrackingWallet
+def write_mode(orig_func):
+	def f(self,*args,**kwargs):
+		if self.mode != 'w':
+			die(1,'{} opened in read-only mode: cannot execute method {}()'.format(
+				type(self).__name__,
+				locals()['orig_func'].__name__
+			))
+		return orig_func(self,*args,**kwargs)
+	return f
+
 class TrackingWallet(MMGenObject,metaclass=AsyncInit):
 
 	caps = ('rescan','batch')

+ 0 - 11
mmgen/util.py

@@ -672,17 +672,6 @@ def get_subclasses(cls,names=False):
 				yield j
 	return tuple((c.__name__ for c in gen(cls)) if names else gen(cls))
 
-# decorator for TrackingWallet
-def write_mode(orig_func):
-	def f(self,*args,**kwargs):
-		if self.mode != 'w':
-			die(1,'{} opened in read-only mode: cannot execute method {}()'.format(
-				type(self).__name__,
-				locals()['orig_func'].__name__
-			))
-		return orig_func(self,*args,**kwargs)
-	return f
-
 def run_session(callback,backend=None):
 
 	async def do():