From d86743a0624ce41a4851f635dde233e43b0dbfc8 Mon Sep 17 00:00:00 2001
From: Dzmitry Hil <dzmitryhil@gmail.com>
Date: Fri, 15 Mar 2024 14:34:02 +0300
Subject: [PATCH] Remove duplicated function

---
 relayer/coreum/contract.go | 49 ++++++++++++++------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/relayer/coreum/contract.go b/relayer/coreum/contract.go
index 9d494aed..86593a4a 100644
--- a/relayer/coreum/contract.go
+++ b/relayer/coreum/contract.go
@@ -522,7 +522,7 @@ func (c *ContractClient) DeployAndInstantiate(
 	byteCode []byte,
 	config InstantiationConfig,
 ) (sdk.AccAddress, error) {
-	_, codeID, err := c.deployContract(ctx, sender, byteCode)
+	_, codeID, err := c.DeployContract(ctx, sender, byteCode)
 	if err != nil {
 		return nil, err
 	}
@@ -583,10 +583,25 @@ func (c *ContractClient) DeployContract(
 	sender sdk.AccAddress,
 	byteCode []byte,
 ) (*sdk.TxResponse, uint64, error) {
-	txRes, codeID, err := c.deployContract(ctx, sender, byteCode)
+	msgStoreCode := &wasmtypes.MsgStoreCode{
+		Sender:       sender.String(),
+		WASMByteCode: byteCode,
+	}
+	c.log.Info(ctx, "Deploying contract bytecode.")
+
+	txRes, err := client.BroadcastTx(ctx, c.clientCtx.WithFromAddress(sender), c.getTxFactory(), msgStoreCode)
+	if err != nil {
+		return nil, 0, errors.Wrap(err, "failed to deploy wasm bytecode")
+	}
+	// handle the genereate only case
+	if txRes == nil {
+		return nil, 0, nil
+	}
+	codeID, err := event.FindUint64EventAttribute(txRes.Events, wasmtypes.EventTypeStoreCode, wasmtypes.AttributeKeyCodeID)
 	if err != nil {
-		return nil, 0, err
+		return nil, 0, errors.Wrap(err, "failed to find code ID in the tx result")
 	}
+	c.log.Info(ctx, "The contract bytecode is deployed.", zap.Uint64("codeID", codeID))
 
 	return txRes, codeID, nil
 }
@@ -1405,34 +1420,6 @@ func (c *ContractClient) GetProhibitedXRPLAddresses(ctx context.Context) ([]stri
 	return response.ProhibitedXRPLAddresses, nil
 }
 
-func (c *ContractClient) deployContract(
-	ctx context.Context,
-	sender sdk.AccAddress,
-	byteCode []byte,
-) (*sdk.TxResponse, uint64, error) {
-	msgStoreCode := &wasmtypes.MsgStoreCode{
-		Sender:       sender.String(),
-		WASMByteCode: byteCode,
-	}
-	c.log.Info(ctx, "Deploying contract bytecode.")
-
-	txRes, err := client.BroadcastTx(ctx, c.clientCtx.WithFromAddress(sender), c.getTxFactory(), msgStoreCode)
-	if err != nil {
-		return nil, 0, errors.Wrap(err, "failed to deploy wasm bytecode")
-	}
-	// handle the genereate only case
-	if txRes == nil {
-		return nil, 0, nil
-	}
-	codeID, err := event.FindUint64EventAttribute(txRes.Events, wasmtypes.EventTypeStoreCode, wasmtypes.AttributeKeyCodeID)
-	if err != nil {
-		return nil, 0, errors.Wrap(err, "failed to find code ID in the tx result")
-	}
-	c.log.Info(ctx, "The contract bytecode is deployed.", zap.Uint64("codeID", codeID))
-
-	return txRes, codeID, nil
-}
-
 func (c *ContractClient) getPaginatedXRPLTokens(
 	ctx context.Context,
 	startAfterKey string,