Browse Source

whitespace: test/overlay

The MMGen Project 4 months ago
parent
commit
ce14c1ba79

+ 22 - 22
test/overlay/__init__.py

@@ -12,18 +12,18 @@
 test.overlay.__init__: Initialize the MMGen test suite overlay tree
 """
 
-import sys,os,shutil
+import sys, os, shutil
 
 def get_overlay_tree_dir(repo_root):
-	return os.path.join(repo_root,'test','overlay','tree')
+	return os.path.join(repo_root, 'test', 'overlay', 'tree')
 
 def overlay_setup(repo_root):
 
-	def process_srcdir(pkgname,d):
+	def process_srcdir(pkgname, d):
 		relpath = d.split('.')
-		srcdir = os.path.join(repo_root,*relpath)
-		destdir = os.path.join(overlay_tree_dir,*relpath)
-		fakemod_dir = os.path.join(fakemod_root,pkgname,*(relpath[1:]))
+		srcdir = os.path.join(repo_root, *relpath)
+		destdir = os.path.join(overlay_tree_dir, *relpath)
+		fakemod_dir = os.path.join(fakemod_root, pkgname, *(relpath[1:]))
 		os.makedirs(destdir)
 		for fn in os.listdir(srcdir):
 			if (
@@ -31,40 +31,40 @@ def overlay_setup(repo_root):
 				d == f'{pkgname}.data' or
 				(d == 'mmgen.proto.secp256k1' and fn.startswith('secp256k1'))
 			):
-				if fn.endswith('.py') and os.path.exists(os.path.join(fakemod_dir,fn)):
+				if fn.endswith('.py') and os.path.exists(os.path.join(fakemod_dir, fn)):
 					make_link(
-						os.path.join(fakemod_dir,fn),
-						os.path.join(destdir,fn) )
+						os.path.join(fakemod_dir, fn),
+						os.path.join(destdir, fn))
 					link_fn = fn.removesuffix('.py') + '_orig.py'
 				else:
 					link_fn = fn
 				make_link(
-					os.path.join(srcdir,fn),
-					os.path.join(destdir,link_fn) )
+					os.path.join(srcdir, fn),
+					os.path.join(destdir, link_fn))
 
 	overlay_tree_dir = get_overlay_tree_dir(repo_root)
-	fakemod_root = os.path.join(repo_root,'test','overlay','fakemods')
-	common_path = os.path.join(os.path.sep,'test','overlay','fakemods')
+	fakemod_root = os.path.join(repo_root, 'test', 'overlay', 'fakemods')
+	common_path = os.path.join(os.path.sep, 'test', 'overlay', 'fakemods')
 	pkgdata = ((
-			os.path.realpath(e.path).removesuffix(os.path.join(common_path,e.name)),
+			os.path.realpath(e.path).removesuffix(os.path.join(common_path, e.name)),
 			e.name
-		) for e in os.scandir(fakemod_root) if e.is_dir() )
+		) for e in os.scandir(fakemod_root) if e.is_dir())
 
-	for repodir,pkgname in pkgdata:
-		if not os.path.exists(os.path.join(overlay_tree_dir,pkgname)):
+	for repodir, pkgname in pkgdata:
+		if not os.path.exists(os.path.join(overlay_tree_dir, pkgname)):
 
 			sys.stderr.write(f'Setting up overlay tree: {pkgname}\n')
 
 			make_link = os.symlink if sys.platform in ('linux', 'darwin') else shutil.copy2
-			shutil.rmtree(os.path.join(overlay_tree_dir,pkgname),ignore_errors=True)
+			shutil.rmtree(os.path.join(overlay_tree_dir, pkgname), ignore_errors=True)
 
 			import configparser
 			cfg = configparser.ConfigParser()
-			cfg.read(os.path.join(repodir,'setup.cfg'))
+			cfg.read(os.path.join(repodir, 'setup.cfg'))
 
-			for d in cfg.get('options','packages').split():
-				process_srcdir(pkgname,d)
+			for d in cfg.get('options', 'packages').split():
+				process_srcdir(pkgname, d)
 
-	sys.path.insert(0,overlay_tree_dir)
+	sys.path.insert(0, overlay_tree_dir)
 
 	return overlay_tree_dir

+ 4 - 4
test/overlay/fakemods/mmgen/crypto.py

@@ -8,8 +8,8 @@ if overlay_fake_os.getenv('MMGEN_TEST_SUITE_DETERMINISTIC'):
 
 	from .test import fake_urandom as overlay_fake_urandom
 
-	Crypto.get_random = lambda self,length: overlay_fake_urandom(
-		len(overlay_fake_get_random_orig( self, length )))
+	Crypto.get_random = lambda self, length: overlay_fake_urandom(
+		len(overlay_fake_get_random_orig(self, length)))
 
-	Crypto.add_user_random = lambda self,rand_bytes,desc: overlay_fake_urandom(
-		len(overlay_fake_add_user_random_orig( self, rand_bytes, desc )))
+	Crypto.add_user_random = lambda self, rand_bytes, desc: overlay_fake_urandom(
+		len(overlay_fake_add_user_random_orig(self, rand_bytes, desc)))

+ 2 - 2
test/overlay/fakemods/mmgen/rpc.py

@@ -6,8 +6,8 @@ if overlay_fake_os.getenv('MMGEN_BOGUS_UNSPENT_DATA'):
 	class overlay_fake_data:
 		rpc_init = rpc_init
 
-	async def rpc_init(*args,**kwargs):
+	async def rpc_init(*args, **kwargs):
 		from .obj import NonNegativeInt
-		ret = await overlay_fake_data.rpc_init(*args,**kwargs)
+		ret = await overlay_fake_data.rpc_init(*args, **kwargs)
 		ret.blockcount = NonNegativeInt(1000000)
 		return ret

+ 1 - 1
test/overlay/fakemods/mmgen/tw/unspent.py

@@ -5,7 +5,7 @@ if overlay_fake_os.getenv('MMGEN_BOGUS_UNSPENT_DATA'):
 
 	class overlay_fake_TwUnspentOutputs(TwUnspentOutputs):
 
-		async def set_dates(self,us):
+		async def set_dates(self, us):
 			for o in us:
 				o.date = 1831006505 - int(9.7 * 60 * (o.confs - 1))
 

+ 4 - 4
test/overlay/fakemods/mmgen/tw/view.py

@@ -15,14 +15,14 @@ if overlay_fake_os.getenv('MMGEN_TEST_SUITE_DETERMINISTIC'):
 		time_iter = (1862651471 + (i*60) for i in range(1000000))
 
 	TwView.date_formatter = {
-		'days':      lambda rpc,secs: (next(overlay_fake_data.time_iter) - secs) // 86400,
-		'date':      lambda rpc,secs: '{}-{:02}-{:02}'.format(
+		'days':      lambda rpc, secs: (next(overlay_fake_data.time_iter) - secs) // 86400,
+		'date':      lambda rpc, secs: '{}-{:02}-{:02}'.format(
 			*time.gmtime(next(overlay_fake_data.time_iter))[:3])[2:],
-		'date_time': lambda rpc,secs: '{}-{:02}-{:02} {:02}:{:02}'.format(
+		'date_time': lambda rpc, secs: '{}-{:02}-{:02} {:02}:{:02}'.format(
 			*time.gmtime(next(overlay_fake_data.time_iter))[:5]),
 	}
 
 if overlay_fake_os.getenv('MMGEN_BOGUS_UNSPENT_DATA'):
 
 	# 1831006505 (09 Jan 2028) = projected time of block 1000000
-	TwView.date_formatter['days'] = lambda rpc,secs: (2178144000 - secs) // 86400 # 9 Jan 2039 00:00:00
+	TwView.date_formatter['days'] = lambda rpc, secs: (2178144000 - secs) // 86400 # 9 Jan 2039 00:00:00

+ 1 - 1
test/overlay/fakemods/mmgen/tx/new.py

@@ -5,7 +5,7 @@ if overlay_fake_os.getenv('MMGEN_BOGUS_UNSPENT_DATA'):
 
 	class overlay_fake_New(New):
 
-		async def warn_chg_addr_used(self,_):
+		async def warn_chg_addr_used(self, _):
 			from ..util import ymsg
 			ymsg('Bogus unspent data: skipping used change address check')
 

+ 2 - 2
test/overlay/fakemods/mmgen/util.py

@@ -9,7 +9,7 @@ if overlay_fake_os.getenv('MMGEN_TEST_SUITE_DETERMINISTIC'):
 		time_iter = (1862651471 + (i*60) for i in range(1000000)) # 9 Jan 2029 11:11:11
 
 	def make_timestamp(secs=None):
-		return overlay_fake_data.make_timestamp( next(overlay_fake_data.time_iter) )
+		return overlay_fake_data.make_timestamp(next(overlay_fake_data.time_iter))
 
 	def make_timestr(secs=None):
-		return overlay_fake_data.make_timestr( next(overlay_fake_data.time_iter) )
+		return overlay_fake_data.make_timestr(next(overlay_fake_data.time_iter))