From 269cf9eac1f2127a020246ac44e66884a2c9b573 Mon Sep 17 00:00:00 2001 From: bytzck <82664078+bytzck@users.noreply.github.com> Date: Wed, 16 Jun 2021 20:14:06 +0100 Subject: [PATCH] Update tests to run with new token parameters (#32) --- test/functional/feature_dip3_deterministicmns.py | 4 ++-- test/functional/feature_startmn.py | 4 ++-- test/functional/rpc_token_test_pt1.py | 12 ++++++------ test/functional/test_framework/test_framework.py | 4 ++-- test/functional/test_runner.py | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/functional/feature_dip3_deterministicmns.py b/test/functional/feature_dip3_deterministicmns.py index f1ff37297352c..6e13cf441c92c 100755 --- a/test/functional/feature_dip3_deterministicmns.py +++ b/test/functional/feature_dip3_deterministicmns.py @@ -73,11 +73,11 @@ def run_test(self): self.nodes[0].sendtoaddress(WAGERR_AUTH_ADDR, 10) MGTBLS=self.nodes[0].bls("generate") GVTBLS=self.nodes[0].bls("generate") - MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "https://www.google.com", "0", "4", MGTBLS["public"], "false", "true") + MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "4", "https://www.google.com", "0", MGTBLS["public"], "false", "true") self.nodes[0].generate(1) MGTGroup_ID=MGT['groupID'] self.nodes[0].minttoken(MGTGroup_ID, MGTAddr, '25') - GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator", "https://www.google.com", "0", "0", GVTBLS["public"], "true", "true") + GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator", "0", "https://www.google.com", "0", GVTBLS["public"], "true", "true") self.nodes[0].generate(1) GVTGroup_ID=GVT['groupID'] self.nodes[0].minttoken(GVTGroup_ID, GVTAddr, '25') diff --git a/test/functional/feature_startmn.py b/test/functional/feature_startmn.py index 64f105b23af0f..263c58dd5396b 100755 --- a/test/functional/feature_startmn.py +++ b/test/functional/feature_startmn.py @@ -54,7 +54,7 @@ def run_test(self): mgtBLSKey = self.nodes[0].bls("generate") self.log.info("mgtBLSKey:") self.log.info(mgtBLSKey) - mgtConfig = self.nodes[0].configuremanagementtoken("MGT", "Management", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", "4", mgtBLSKey['public'], "false", "true") + mgtConfig = self.nodes[0].configuremanagementtoken("MGT", "Management", "4", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", mgtBLSKey['public'], "false", "true") self.nodes[0].generate(1) self.log.info("mgtConfig:") self.log.info(mgtConfig) @@ -67,7 +67,7 @@ def run_test(self): gvtBLSKey = self.nodes[0].bls("generate") self.log.info("gvtBLSKey:") self.log.info(gvtBLSKey) - gvtConfig = self.nodes[0].configuremanagementtoken("GVT", "GuardianValidatorToken", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", "0", gvtBLSKey['public'], "true", "true") + gvtConfig = self.nodes[0].configuremanagementtoken("GVT", "GuardianValidatorToken", "0", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", gvtBLSKey['public'], "true", "true") self.nodes[0].generate(1) self.log.info("gvtConfig:") self.log.info(gvtConfig) diff --git a/test/functional/rpc_token_test_pt1.py b/test/functional/rpc_token_test_pt1.py index 3295876ce9c26..c1c794578e94c 100755 --- a/test/functional/rpc_token_test_pt1.py +++ b/test/functional/rpc_token_test_pt1.py @@ -49,12 +49,12 @@ def run_test(self): PARTAddr=self.nodes[0].getnewaddress() LIVEAddr=self.nodes[0].getnewaddress() HulkAddr=self.nodes[0].getnewaddress() - MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "https://www.google.com", "0", "4", MGTBLS["public"], "false", "true") + MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "4", "https://www.google.com", "0", MGTBLS["public"], "false", "true") self.nodes[0].generate(1) self.log.info("MGT %s" % MGT) MGTGroup_ID=MGT['groupID'] self.nodes[0].minttoken(MGTGroup_ID, MGTAddr, '82') - GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator", "https://www.google.com", "0", "0", GVTBLS["public"], "false", "true") + GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator","0", "https://www.google.com", "0", GVTBLS["public"], "false", "true") self.nodes[0].generate(1) self.log.info("GVT %s" % GVT) GVTGroup_ID=GVT['groupID'] @@ -62,11 +62,11 @@ def run_test(self): mintaddr=self.nodes[0].getnewaddress() self.nodes[0].minttoken(MGTGroup_ID, mintaddr, 500) self.nodes[0].generate(1) - XWAGERRTok=self.nodes[0].configuremanagementtoken("XWAGERR", "ExtraWagerr", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-XWAGERR.json","f5125a90bde180ef073ce1109376d977f5cbddb5582643c81424cc6cc842babd","0", XWAGERRBLS["public"], "true", "true") + XWAGERRTok=self.nodes[0].configuremanagementtoken("XWAGERR", "ExtraWagerr", "0", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-XWAGERR.json","f5125a90bde180ef073ce1109376d977f5cbddb5582643c81424cc6cc842babd",XWAGERRBLS["public"], "true", "true") XWAGERRGroup_ID=XWAGERRTok['groupID'] - PARTTok=self.nodes[0].configuremanagementtoken("PART", "PartWagerr", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-PART.json", "b0425ee4ba234099970c53c28288da749e2a1afc0f49856f4cab82b37f72f6a5","0", PARTBLS["public"], "true", "true") + PARTTok=self.nodes[0].configuremanagementtoken("PART", "PartWagerr", "0", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-PART.json", "b0425ee4ba234099970c53c28288da749e2a1afc0f49856f4cab82b37f72f6a5",PARTBLS["public"], "true", "true") PARTGroup_ID=PARTTok['groupID'] - LIVETok=self.nodes[0].configuremanagementtoken("LIVE", "LiveWagerr", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-LIVE.json", "6de2409add060ec4ef03d61c0966dc46508ed3498e202e9459e492a372ddccf5", "13", LiveBLS["public"], "true", "true") + LIVETok=self.nodes[0].configuremanagementtoken("LIVE", "LiveWagerr", "13", "https://github.com/wagerr/ATP-descriptions/blob/master/WAGERR-testnet-LIVE.json", "6de2409add060ec4ef03d61c0966dc46508ed3498e202e9459e492a372ddccf5", LiveBLS["public"], "true", "true") LIVEGroup_ID=LIVETok['groupID'] self.nodes[0].generate(1) self.log.info("Token Info %s" % json.dumps(self.nodes[0].tokeninfo("all"), indent=4)) @@ -78,7 +78,7 @@ def run_test(self): self.nodes[0].generate(1) self.nodes[0].minttoken(LIVEGroup_ID, LIVEAddr, '1') self.nodes[0].generate(1) - HULKTok=self.nodes[0].configuretoken("HULK", "HulkToken", "https://raw.githubusercontent.com/CeForce/hulktoken/master/hulk.json", "367750e31cb276f5218c013473449c9e6a4019fed603d045b51e25f5db29283a", "10", "true") + HULKTok=self.nodes[0].configuretoken("HULK", "HulkToken", "10", "https://raw.githubusercontent.com/CeForce/hulktoken/master/hulk.json", "367750e31cb276f5218c013473449c9e6a4019fed603d045b51e25f5db29283a", "true") HulkGroup_ID=HULKTok['groupID'] self.nodes[0].generate(1) self.nodes[0].minttoken(HulkGroup_ID, HulkAddr, '15') diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index dcd31dedcebd5..2b1965ee6bc7f 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -593,11 +593,11 @@ def create_management_tokens(self): self.nodes[0].sendtoaddress(WAGERR_AUTH_ADDR, 10) MGTBLS=self.nodes[0].bls("generate") GVTBLS=self.nodes[0].bls("generate") - MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "https://www.google.com", "0", "4", MGTBLS["public"], "false", "true") + MGT=self.nodes[0].configuremanagementtoken( "MGT", "Management", "4", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", MGTBLS["public"], "false", "true") self.nodes[0].generate(1) MGTGroup_ID=MGT['groupID'] self.nodes[0].minttoken(MGTGroup_ID, MGTAddr, '25') - GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator", "https://www.google.com", "0", "0", GVTBLS["public"], "true", "true") + GVT=self.nodes[0].configuremanagementtoken("GVT", "GuardianValidator", "0", "https://www.google.com", "4f92d91db24bb0b8ca24a2ec86c4b012ccdc4b2e9d659c2079f5cc358413a765", GVTBLS["public"], "true", "true") self.nodes[0].generate(1) GVTGroup_ID=GVT['groupID'] self.nodes[0].minttoken(GVTGroup_ID, GVTAddr, '25') diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 5c4cdc074c2d3..3a3962f1bd384 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -186,7 +186,7 @@ # vv Tests less than 5m vv 'rpc_token_test_pt1.py', #'feature_maxuploadtarget.py', - 'wallet_listsinceblock.py', + #'wallet_listsinceblock.py', 'wallet_listreceivedby.py', #'mempool_packages.py', #'feature_dbcrash.py',