From 38bc3ceaa04c502d3e965a22feac658b271e40d9 Mon Sep 17 00:00:00 2001 From: stana-ethernal Date: Wed, 17 May 2023 11:27:33 +0200 Subject: [PATCH] cr fix - remove flags from test --- benchmark/root_child_send_tx.go | 36 +++++++++++++-------------------- command/benchmark/benchmark.go | 14 ++++++------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/benchmark/root_child_send_tx.go b/benchmark/root_child_send_tx.go index adbc4fcfc8..ab1fc848a5 100644 --- a/benchmark/root_child_send_tx.go +++ b/benchmark/root_child_send_tx.go @@ -1,7 +1,6 @@ package benchmark import ( - "flag" "math/big" "testing" @@ -21,10 +20,6 @@ var ( singleContSetFunc = abi.MustNewMethod("function addValue(uint256 value) public") multiContSetAddrFunc = abi.MustNewMethod("function setContractAddr(address _contract) public") multiContFnA = abi.MustNewMethod("function fnA() public returns (uint256)") - RootJSONRPC = flag.String("rootJSONRPC", "", "JSONRPC address of the root node") - ChildJSONRPC = flag.String("childJSONRPC", "", "JSONRPC address of the child node") - PrivateKey = flag.String("privateKey", "", "private key that will be used to send tx") - StartCluster = flag.Bool("startCluster", true, "starts the cluster if sets to true") ) // The rootChildSendTx function executes test cases that measure transaction execution on both the root and child chains @@ -32,17 +27,10 @@ var ( // which may include starting the cluster, deploying contracts, and building the test cases. // After building the test cases, rootChildSendTx returns them along with a cleanup function that should be called // after the test cases have been executed. The test cases are executed by the TxTestCasesExecutor. -// The rootJSONRPC, childJSONRPC, privateKey and startCluster flags are used to configure the testing environment. -// If startCluster is false, then the local cluster will not be started and the provided addresses -// will be used as the endpoints to the root and child chains. -// If startCluster is set to true, the local cluster will be started automatically. -// If the private key is specified, it will be used as the transaction sender. -// Otherwise, the local cluster will generate a sender key. -// If startCluster is set to false, then the sender must have enough funds for sending transactions. func rootChildSendTx(b *testing.B) { b.Helper() // set up environment, get test cases and clean up fn - testCases, cleanUpFn := RootChildSendTxSetUp(b) + testCases, cleanUpFn := RootChildSendTxSetUp(b, "", "", "", true) defer cleanUpFn() // Loop over the test cases and measure the execution time of the transactions @@ -52,21 +40,25 @@ func rootChildSendTx(b *testing.B) { } // RootChildSendTxSetUp sets environment for execution of sentTx test cases on both root and child chains and -// returns test cases and clean up fn -func RootChildSendTxSetUp(b *testing.B) ([]TxTestCase, func()) { +// returns test cases and clean up fn. +// The rootJSONRPC, childJSONRPC, privateKey and startCluster params are used to configure the testing environment. +// If startCluster is false, then the local cluster will not be started and the provided addresses +// will be used as the endpoints to the root and child chains. +// If startCluster is set to true, the local cluster will be started automatically. +// If the private key is specified, it will be used as the transaction sender. +// Otherwise, the local cluster will generate a sender key. +// If startCluster is set to false, then the sender must have enough funds for sending transactions. +func RootChildSendTxSetUp(b *testing.B, rootNodeAddr, childNodeAddr, + privateKey string, startCluster bool) ([]TxTestCase, func()) { b.Helper() // check if test is called with the root and child node addresses and private key set. // if that is the case use that json rpc addresses, otherwise run the cluster - rootNodeAddr := *RootJSONRPC - childNodeAddr := *ChildJSONRPC - privateKeyRaw := *PrivateKey - startCluster := *StartCluster - require.True(b, startCluster || rootNodeAddr != "" && childNodeAddr != "" && privateKeyRaw != "") + require.True(b, startCluster || rootNodeAddr != "" && childNodeAddr != "" && privateKey != "") var sender ethgo.Key // if the privateKey flag is set then recover the key, otherwise recover the key - if privateKeyRaw != "" { - sender = getPrivateKey(b, privateKeyRaw) + if privateKey != "" { + sender = getPrivateKey(b, privateKey) } else { var err error sender, err = wallet.GenerateKey() diff --git a/command/benchmark/benchmark.go b/command/benchmark/benchmark.go index 0f806bf997..7bdfd1c508 100644 --- a/command/benchmark/benchmark.go +++ b/command/benchmark/benchmark.go @@ -55,14 +55,14 @@ func runCommand(cmd *cobra.Command, _ []string) { // set up the testing environment testing.Init() - // set testing params - benchmark.RootJSONRPC = ¶ms.rootJSONRPC - benchmark.ChildJSONRPC = ¶ms.childJSONRPC - benchmark.PrivateKey = ¶ms.privateKey - benchmark.StartCluster = ¶ms.startCluster - // set up environment, get test cases and clean up fn - testCases, cleanUpFn := benchmark.RootChildSendTxSetUp(&testing.B{}) + testCases, cleanUpFn := benchmark.RootChildSendTxSetUp( + &testing.B{}, + params.rootJSONRPC, + params.childJSONRPC, + params.privateKey, + params.startCluster, + ) defer cleanUpFn() // Loop over the test cases and call the benchmark test