From 27759c913d92f003550090d86b36715b11d789e4 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 21 Oct 2022 10:37:51 +0000
Subject: [PATCH] minor fixes and changes

---
 mmgen/data/version           | 2 +-
 mmgen/proto/btc/params.py    | 1 +
 mmgen/proto/btc/rpc.py       | 4 ++--
 mmgen/util2.py               | 2 +-
 test/test_py_d/ts_regtest.py | 2 --
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mmgen/data/version b/mmgen/data/version
index f005e997..271aef66 100644
--- a/mmgen/data/version
+++ b/mmgen/data/version
@@ -1 +1 @@
-13.3.dev7
+13.3.dev8
diff --git a/mmgen/proto/btc/params.py b/mmgen/proto/btc/params.py
index 3efa1ee4..00c25356 100755
--- a/mmgen/proto/btc/params.py
+++ b/mmgen/proto/btc/params.py
@@ -46,6 +46,7 @@ class mainnet(CoinProtocol.Secp256k1): # chainparams.cpp
 	sign_mode       = 'daemon'
 	avg_bdi         = int(9.7 * 60) # average block discovery interval (historical)
 	halving_interval = 210000
+	diff_adjust_interval = 2016
 	max_halvings    = 64
 	start_subsidy   = 50
 	ignore_daemon_version = False
diff --git a/mmgen/proto/btc/rpc.py b/mmgen/proto/btc/rpc.py
index 6d5b616c..330041d7 100755
--- a/mmgen/proto/btc/rpc.py
+++ b/mmgen/proto/btc/rpc.py
@@ -297,7 +297,7 @@ class BitcoinRPCClient(RPCClient,metaclass=AsyncInit):
 			if 'deployment_info' in self.caps:
 				return (
 					self.cached['deploymentinfo']['deployments']['segwit']['active']
-					or ( g.test_suite and not os.getenv('MMGEN_TEST_SUITE_REGTEST') )
+					or ( g.test_suite and not self.chain == 'regtest' )
 				)
 
 			d = self.cached['blockchaininfo']
@@ -314,7 +314,7 @@ class BitcoinRPCClient(RPCClient,metaclass=AsyncInit):
 			except:
 				pass
 
-			if g.test_suite:
+			if g.test_suite and not self.chain == 'regtest':
 				return True
 
 			return False
diff --git a/mmgen/util2.py b/mmgen/util2.py
index 306feb0e..7b1ec903 100755
--- a/mmgen/util2.py
+++ b/mmgen/util2.py
@@ -34,7 +34,7 @@ def removeprefix(s,pfx): # workaround for pre-Python 3.9
 	return s[len(pfx):] if s.startswith(pfx) else s
 
 def removesuffix(s,sfx): # workaround for pre-Python 3.9
-	return s[:len(sfx)] if s.endswith(sfx) else s
+	return s[:-len(sfx)] if s.endswith(sfx) else s
 
 def get_keccak(cached_ret=[]):
 
diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py
index 7e62bebc..3baf9c5d 100755
--- a/test/test_py_d/ts_regtest.py
+++ b/test/test_py_d/ts_regtest.py
@@ -367,14 +367,12 @@ class TestSuiteRegtest(TestSuiteBase,TestSuiteShared):
 				self.miner_wif = 'cTyMdQ2BgfAsjopRVZrj7AoEGp97pKfrC2NkqLuwHr4KHfPNAKwp'
 
 		os.environ['MMGEN_BOGUS_SEND'] = ''
-		os.environ['MMGEN_TEST_SUITE_REGTEST'] = '1'
 		self.write_to_tmpfile('wallet_password',rt_pw)
 
 		self.dfl_mmtype = 'C' if self.proto.coin == 'BCH' else 'B'
 
 	def __del__(self):
 		os.environ['MMGEN_BOGUS_SEND'] = '1'
-		os.environ['MMGEN_TEST_SUITE_REGTEST'] = ''
 
 	def _add_comments_to_addr_file(self,addrfile,outfile,use_labels=False):
 		silence()