tools: Use ECC_Context helper in bitcoin-tx and bitcoin-wallet tools

ryanofsky · ryanofsky · commit 668e2f8eeb03 · 2024-05-07T08:55:34.000-04:00
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -694,21 +694,10 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& flagStr)
     tx = mergedTx;
 }
 
-class Secp256k1Init
-{
-public:
-    Secp256k1Init() {
-        ECC_Start();
-    }
-    ~Secp256k1Init() {
-        ECC_Stop();
-    }
-};
-
 static void MutateTx(CMutableTransaction& tx, const std::string& command,
                      const std::string& commandVal)
 {
-    std::unique_ptr<Secp256k1Init> ecc;
+    std::unique_ptr<ECC_Context> ecc;
 
     if (command == "nversion")
         MutateTxVersion(tx, commandVal);
@@ -728,18 +717,18 @@ static void MutateTx(CMutableTransaction& tx, const std::string& command,
     else if (command == "outaddr")
         MutateTxAddOutAddr(tx, commandVal);
     else if (command == "outpubkey") {
-        ecc.reset(new Secp256k1Init());
+        ecc.reset(new ECC_Context());
         MutateTxAddOutPubKey(tx, commandVal);
     } else if (command == "outmultisig") {
-        ecc.reset(new Secp256k1Init());
+        ecc.reset(new ECC_Context());
         MutateTxAddOutMultiSig(tx, commandVal);
     } else if (command == "outscript")
         MutateTxAddOutScript(tx, commandVal);
     else if (command == "outdata")
         MutateTxAddOutData(tx, commandVal);
 
     else if (command == "sign") {
-        ecc.reset(new Secp256k1Init());
+        ecc.reset(new ECC_Context());
         MutateTxSign(tx, commandVal);
     }
 
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
@@ -132,10 +132,9 @@ MAIN_FUNCTION
         return EXIT_FAILURE;
     }
 
-    ECC_Start();
+    ECC_Context ecc_context{};
     if (!wallet::WalletTool::ExecuteWalletToolFunc(args, command->command)) {
         return EXIT_FAILURE;
     }
-    ECC_Stop();
     return EXIT_SUCCESS;
 }

Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,9 @@ MAIN_FUNCTION`
`132`	`132`	`return EXIT_FAILURE;`
`133`	`133`	`}`
`134`	`134`
`135`		`- ECC_Start();`
	`135`	`+ ECC_Context ecc_context{};`
`136`	`136`	`if (!wallet::WalletTool::ExecuteWalletToolFunc(args, command->command)) {`
`137`	`137`	`return EXIT_FAILURE;`
`138`	`138`	`}`
`139`		`- ECC_Stop();`
`140`	`139`	`return EXIT_SUCCESS;`
`141`	`140`	`}`