[PH] Use EOSMechanics contract with Performance Test

tests/TestHarness/Cluster.py

@@ -94,7 +94,7 @@ def __init__(self, walletd=False, localCluster=True, host="localhost", port=8888
         defproduceraPrvtKey: Defproducera account private key
         defproducerbPrvtKey: Defproducerb account private key
         """
-        self.accounts={}
+        self.accounts=[]
         self.nodes=[]
         self.unstartedNodes=[]
         self.localCluster=localCluster
@@ -705,7 +705,9 @@ def createAccountKeys(count):
 
     # create account keys and import into wallet. Wallet initialization will be user responsibility
     # also imports defproducera and defproducerb accounts
-    def populateWallet(self, accountsCount, wallet, accountNames: list=None):
+    def populateWallet(self, accountsCount, wallet, accountNames: list=None, createProducerAccounts: bool=False):
+        if accountsCount == 0 and len(accountNames) == 0:
+            return True
         if self.walletMgr is None:
             Utils.Print("ERROR: WalletMgr hasn't been initialized.")
             return False
@@ -718,15 +720,16 @@ def populateWallet(self, accountsCount, wallet, accountNames: list=None):
                 Utils.Print("Account keys creation failed.")
                 return False
 
-        Utils.Print("Importing keys for account %s into wallet %s." % (self.defproduceraAccount.name, wallet.name))
-        if not self.walletMgr.importKey(self.defproduceraAccount, wallet):
-            Utils.Print("ERROR: Failed to import key for account %s" % (self.defproduceraAccount.name))
-            return False
+        if createProducerAccounts:
+            Utils.Print("Importing keys for account %s into wallet %s." % (self.defproduceraAccount.name, wallet.name))
+            if not self.walletMgr.importKey(self.defproduceraAccount, wallet):
+                Utils.Print("ERROR: Failed to import key for account %s" % (self.defproduceraAccount.name))
+                return False
 
-        Utils.Print("Importing keys for account %s into wallet %s." % (self.defproducerbAccount.name, wallet.name))
-        if not self.walletMgr.importKey(self.defproducerbAccount, wallet):
-            Utils.Print("ERROR: Failed to import key for account %s" % (self.defproducerbAccount.name))
-            return False
+            Utils.Print("Importing keys for account %s into wallet %s." % (self.defproducerbAccount.name, wallet.name))
+            if not self.walletMgr.importKey(self.defproducerbAccount, wallet):
+                Utils.Print("ERROR: Failed to import key for account %s" % (self.defproducerbAccount.name))
+                return False
 
         if accountNames is not None:
             for idx, name in enumerate(accountNames):
@@ -737,8 +740,8 @@ def populateWallet(self, accountsCount, wallet, accountNames: list=None):
             if not self.walletMgr.importKey(account, wallet):
                 Utils.Print("ERROR: Failed to import key for account %s" % (account.name))
                 return False
+            self.accounts.append(account)
 
-        self.accounts=accounts
         return True
 
     def getNodeP2pPort(self, nodeId: int):
@@ -1592,20 +1595,21 @@ def cleanup(self):
             os.remove(f)
 
     # Create accounts and validates that the last transaction is received on root node
-    def createAccounts(self, creator, waitForTransBlock=True, stakedDeposit=1000, validationNodeIndex=0):
+    def createAccounts(self, creator, nameList: list, waitForTransBlock=True, stakedDeposit=1000, validationNodeIndex=0):
         if self.accounts is None:
             return True
-
         transId=None
         for account in self.accounts:
-            if Utils.Debug: Utils.Print("Create account %s." % (account.name))
-            if Utils.Debug: Utils.Print("Validation node %s" % validationNodeIndex)
-            trans=self.createAccountAndVerify(account, creator, stakedDeposit, validationNodeIndex=validationNodeIndex)
-            if trans is None:
-                Utils.Print("ERROR: Failed to create account %s." % (account.name))
-                return False
-            if Utils.Debug: Utils.Print("Account %s created." % (account.name))
-            transId=Node.getTransId(trans)
+            ret = self.biosNode.getEosAccount(account.name)
+            if (len(nameList) == 0 and ret is None) or account.name in nameList:
+                if Utils.Debug: Utils.Print("Create account %s." % (account.name))
+                if Utils.Debug: Utils.Print("Validation node %s" % validationNodeIndex)
+                trans=self.createAccountAndVerify(account, creator, stakedDeposit, validationNodeIndex=validationNodeIndex)
+                if trans is None:
+                    Utils.Print("ERROR: Failed to create account %s." % (account.name))
+                    return False
+                if Utils.Debug: Utils.Print("Account %s created." % (account.name))
+                transId=Node.getTransId(trans)
 
         if waitForTransBlock and transId is not None:
             node=self.nodes[validationNodeIndex]

tests/TestHarness/launch_transaction_generators.py

@@ -73,7 +73,7 @@ def launch(self, waitToComplete=True):
                         f'--actions-data {self.actionsData} '
                         f'--actions-auths {self.actionsAuths} '
                         f'--peer-endpoint {self.peerEndpoint} '
-                        f'--port {self.port}'
+                        f'--port {self.port} '
                     )
                 self.subprocess_ret_codes.append(
                     subprocess.Popen([
@@ -91,7 +91,7 @@ def launch(self, waitToComplete=True):
                         '--actions-data', f'{self.actionsData}',
                         '--actions-auths', f'{self.actionsAuths}',
                         '--peer-endpoint', f'{self.peerEndpoint}',
-                        '--port', f'{self.port}'
+                        '--port', f'{self.port}',
                     ])
                 )
             else:
@@ -108,7 +108,7 @@ def launch(self, waitToComplete=True):
                         f'--target-tps {targetTps} '
                         f'--log-dir {self.logDir} '
                         f'--peer-endpoint {self.peerEndpoint} '
-                        f'--port {self.port}'
+                        f'--port {self.port} '
                     )
                 self.subprocess_ret_codes.append(
                     subprocess.Popen([
@@ -123,7 +123,7 @@ def launch(self, waitToComplete=True):
                         '--target-tps', f'{targetTps}',
                         '--log-dir', f'{self.logDir}',
                         '--peer-endpoint', f'{self.peerEndpoint}',
-                        '--port', f'{self.port}'
+                        '--port', f'{self.port}',
                     ])
                 )
         exitCodes=None

tests/performance_tests/CMakeLists.txt

@@ -7,12 +7,14 @@ configure_file(nodeos_log_2_0_14.txt.gz nodeos_log_2_0_14.txt.gz COPYONLY)
 configure_file(nodeos_log_3_2.txt.gz nodeos_log_3_2.txt.gz COPYONLY)
 configure_file(genesis.json genesis.json COPYONLY)
 configure_file(validate_nodeos_plugin_args.py validate_nodeos_plugin_args.py COPYONLY)
+configure_file(cpuTrxData.json cpuTrxData.json COPYONLY)
 configure_file(userTrxDataTransfer.json userTrxDataTransfer.json COPYONLY)
 configure_file(userTrxDataNewAccount.json userTrxDataNewAccount.json COPYONLY)
 
-add_test(NAME performance_test_basic COMMAND tests/performance_tests/performance_test_basic.py -v -p 1 -n 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --clean-run WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME performance_test_basic COMMAND tests/performance_tests/performance_test_basic.py -v -p 1 -n 1 --target-tps 20 --tps-limit-per-generator 10 --clean-run WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME performance_test_basic_ex_transfer_trx_spec COMMAND tests/performance_tests/performance_test_basic.py -v -p 1 -n 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --clean-run --user-trx-data-file tests/performance_tests/userTrxDataTransfer.json WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME performance_test_basic_ex_new_acct_trx_spec COMMAND tests/performance_tests/performance_test_basic.py -v -p 1 -n 1 --target-tps 20 --tps-limit-per-generator 10 --test-duration-sec 5 --clean-run --user-trx-data-file tests/performance_tests/userTrxDataNewAccount.json WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_test(NAME performance_test_basic_ex_cpu_trx_spec COMMAND tests/performance_tests/performance_test_basic.py -v -p 1 -n 1 --target-tps 20 --tps-limit-per-generator 10 --clean-run --user-trx-data-file tests/performance_tests/cpuTrxData.json WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME log_reader_tests COMMAND tests/performance_tests/log_reader_tests.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 add_test(NAME validate_nodeos_plugin_args COMMAND tests/performance_tests/validate_nodeos_plugin_args.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set_property(TEST performance_test_basic PROPERTY LABELS nonparallelizable_tests)

tests/performance_tests/cpuTrxData.json

@@ -0,0 +1,16 @@
+{
+    "initAccounts": ["c"],
+    "abiFile": "unittests/contracts/eosio.mechanics/contracts/eosmechanics.abi",
+    "actions": [
+        {
+            "actionName": "cpu",
+            "actionData": {
+            },
+            "actionAuthAcct": "c",
+            "authorization": {
+                "actor": "c",
+                "permission": "active"
+            }
+        }
+    ]
+}

tests/performance_tests/performance_test_basic.py

@@ -78,6 +78,7 @@ class SpecifiedContract:
             contractDir: str = "unittests/contracts/eosio.system"
             wasmFile: str = "eosio.system.wasm"
             abiFile: str = "eosio.system.abi"
+            account: Account = Account(accountName)
 
         pnodes: int = 1
         totalNodes: int = 2
@@ -276,18 +277,30 @@ def launchCluster(self):
             )
 
     def setupWalletAndAccounts(self, accountCnt: int=2, accountNames: list=None):
-        self.wallet = self.walletMgr.create('default')
         self.accountNames=[]
+        newAccountNames=[]
         self.accountPrivKeys=[]
         if accountNames is not None:
-            self.cluster.populateWallet(accountsCount=len(accountNames), wallet=self.wallet, accountNames=accountNames)
-            self.cluster.createAccounts(self.cluster.eosioAccount, stakedDeposit=0, validationNodeIndex=self.validationNodeId)
-            for index in range(0, len(accountNames)):
-                self.accountNames.append(self.cluster.accounts[index].name)
-                self.accountPrivKeys.append(self.cluster.accounts[index].activePrivateKey)
+            for name in accountNames:
+                if name == self.clusterConfig.specifiedContract.accountName:
+                    self.cluster.accounts.append(self.clusterConfig.specifiedContract.account)
+                    self.accountNames.append(self.clusterConfig.specifiedContract.account.name)
+                    self.accountPrivKeys.append(self.clusterConfig.specifiedContract.account.ownerPrivateKey)
+                    self.accountPrivKeys.append(self.clusterConfig.specifiedContract.account.activePrivateKey)
+                else:
+                    ret = self.cluster.biosNode.getEosAccount(name)
+                    if ret is None:
+                        newAccountNames.append(name)
+            self.cluster.populateWallet(accountsCount=len(newAccountNames), wallet=self.wallet, accountNames=newAccountNames, createProducerAccounts=True)
+            self.cluster.createAccounts(self.cluster.eosioAccount, newAccountNames, stakedDeposit=0, validationNodeIndex=self.validationNodeId)
+            if len(newAccountNames) != 0:
+                for index in range(len(self.accountNames), len(accountNames)):
+                    self.accountNames.append(self.cluster.accounts[index].name)
+                    self.accountPrivKeys.append(self.cluster.accounts[index].activePrivateKey)
+                    self.accountPrivKeys.append(self.cluster.accounts[index].ownerPrivateKey)
         else:
-            self.cluster.populateWallet(accountsCount=accountCnt, wallet=self.wallet)
-            self.cluster.createAccounts(self.cluster.eosioAccount, stakedDeposit=0, validationNodeIndex=self.validationNodeId)
+            self.cluster.populateWallet(accountsCount=accountCnt, wallet=self.wallet, createProducerAccounts=True)
+            self.cluster.createAccounts(self.cluster.eosioAccount, newAccountNames, stakedDeposit=0, validationNodeIndex=self.validationNodeId)
             for index in range(0, accountCnt):
                 self.accountNames.append(self.cluster.accounts[index].name)
                 self.accountPrivKeys.append(self.cluster.accounts[index].activePrivateKey)
@@ -297,17 +310,20 @@ def readUserTrxDataFromFile(self, userTrxDataFile: Path):
             self.userTrxDataDict = json.load(f)
 
     def setupContract(self):
-        if (self.clusterConfig.specifiedContract.accountName != self.cluster.eosioAccount.name):
+        if self.clusterConfig.specifiedContract.accountName != self.cluster.eosioAccount.name:
             specifiedAccount = Account(self.clusterConfig.specifiedContract.accountName)
+            specifiedAccount.name = self.clusterConfig.specifiedContract.accountName
             specifiedAccount.ownerPublicKey = self.clusterConfig.specifiedContract.ownerPublicKey
             specifiedAccount.ownerPrivateKey = self.clusterConfig.specifiedContract.ownerPrivateKey
             specifiedAccount.activePublicKey = self.clusterConfig.specifiedContract.activePublicKey
             specifiedAccount.activePrivateKey = self.clusterConfig.specifiedContract.activePrivateKey
             self.cluster.createAccountAndVerify(specifiedAccount, self.cluster.eosioAccount, validationNodeIndex=self.validationNodeId)
+            self.clusterConfig.specifiedContract.account = specifiedAccount
             print("Publishing contract")
             transaction=self.cluster.biosNode.publishContract(specifiedAccount, self.clusterConfig.specifiedContract.contractDir,
                                                             self.clusterConfig.specifiedContract.wasmFile,
                                                             self.clusterConfig.specifiedContract.abiFile, waitForTransBlock=True)
+
             if transaction is None:
                 print("ERROR: Failed to publish contract.")
                 return None
@@ -327,6 +343,7 @@ def runTpsTest(self) -> PtbTpsTestResult:
         self.producerNode = self.cluster.getNode(self.producerNodeId)
         self.producerP2pPort = self.cluster.getNodeP2pPort(self.producerNodeId)
         self.validationNode = self.cluster.getNode(self.validationNodeId)
+        self.wallet = self.walletMgr.create('default')
         self.setupContract()
         info = self.producerNode.getInfo()
         chainId = info['chain_id']
@@ -344,7 +361,6 @@ def runTpsTest(self) -> PtbTpsTestResult:
                 print(f"Creating accounts specified in userTrxData: {self.userTrxDataDict['initAccounts']}")
                 self.setupWalletAndAccounts(accountCnt=len(self.userTrxDataDict['initAccounts']), accountNames=self.userTrxDataDict['initAccounts'])
             abiFile = self.userTrxDataDict['abiFile']
-
             actionsDataJson = json.dumps(self.userTrxDataDict['actions'])
 
             authorizations={}
@@ -369,13 +385,11 @@ def runTpsTest(self) -> PtbTpsTestResult:
 
         self.data.startBlock = self.waitForEmptyBlocks(self.validationNode, self.emptyBlockGoal)
         tpsTrxGensConfig = TpsTrxGensConfig(targetTps=self.ptbConfig.targetTps, tpsLimitPerGenerator=self.ptbConfig.tpsLimitPerGenerator)
-
         trxGenLauncher = TransactionGeneratorsLauncher(chainId=chainId, lastIrreversibleBlockId=lib_id, contractOwnerAccount=self.clusterConfig.specifiedContract.accountName,
                                                        accts=','.join(map(str, self.accountNames)), privateKeys=','.join(map(str, self.accountPrivKeys)),
                                                        trxGenDurationSec=self.ptbConfig.testTrxGenDurationSec, logDir=self.trxGenLogDirPath,
                                                        abiFile=abiFile, actionsData=actionsDataJson, actionsAuths=actionsAuthsJson,
                                                        peerEndpoint=self.producerNode.host, port=self.producerP2pPort, tpsTrxGensConfig=tpsTrxGensConfig)
-
         trxGenExitCodes = trxGenLauncher.launch()
         print(f"Transaction Generator exit codes: {trxGenExitCodes}")
         for exitCode in trxGenExitCodes:
@@ -436,6 +450,8 @@ def analyzeResultsAndReport(self, testResult: PtbTpsTestResult):
                                                completedRun=testResult.completedRun)
 
         jsonReport = None
+        self.ptbConfig.quiet = True
+        self.ptbConfig.delReport = True
         if not self.ptbConfig.quiet or not self.ptbConfig.delReport:
             jsonReport = log_reader.reportAsJSON(self.report)
 

tests/trx_generator/main.cpp

@@ -124,8 +124,8 @@ int main(int argc, char** argv) {
 
       if(vmap.count("accounts")) {
          boost::split(account_str_vector, accts, boost::is_any_of(","));
-         if(!transaction_specified && account_str_vector.size() < 2) {
-            ilog("Initialization error: requires at minimum 2 transfer accounts");
+         if(account_str_vector.size() < 1) {
+            ilog("Initialization error: requires at minimum 1 account");
             cli.print(std::cerr);
             return INITIALIZE_FAIL;
          }

unittests/contracts/CMakeLists.txt

@@ -25,3 +25,4 @@ add_subdirectory(eosio.msig)
 add_subdirectory(eosio.system)
 add_subdirectory(eosio.token)
 add_subdirectory(eosio.wrap)
+add_subdirectory(eosio.mechanics)

unittests/contracts/eosio.mechanics/CMakeLists.txt

@@ -0,0 +1 @@
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/contracts/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/contracts/)

unittests/contracts/eosio.mechanics/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Aloha EOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.