refactor: clean up exectuable

contract_execute_transaction_test.go

@@ -9,7 +9,7 @@ func TestContractExecuteTransaction_Execute(t *testing.T) {
 	client := newTestClient(t)
 
 	// Note: this is the bytecode for the contract found in the example for ./examples/create_simple_contract
-	testContractByteCode := []byte(`608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506101cb806100606000396000f3fe608060405260043610610046576000357c01000000000000000000000000000000000000000000000000000000009004806341c0e1b51461004b578063cfae321714610062575b600080fd5b34801561005757600080fd5b506100606100f2565b005b34801561006e57600080fd5b50610077610162565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156100b757808201518184015260208101905061009c565b50505050905090810190601f1680156100e45780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415610160573373ffffffffffffffffffffffffffffffffffffffff16ff5b565b60606040805190810160405280600d81526020017f48656c6c6f2c20776f726c64210000000000000000000000000000000000000081525090509056fea165627a7a72305820ae96fb3af7cde9c0abfe365272441894ab717f816f07f41f07b1cbede54e256e0029`)
+	testContractByteCode := []byte(`608060405234801561001057600080fd5b506040516104d73803806104d78339818101604052602081101561003357600080fd5b810190808051604051939291908464010000000082111561005357600080fd5b90830190602082018581111561006857600080fd5b825164010000000081118282018810171561008257600080fd5b82525081516020918201929091019080838360005b838110156100af578181015183820152602001610097565b50505050905090810190601f1680156100dc5780820380516001836020036101000a031916815260200191505b506040525050600080546001600160a01b0319163317905550805161010890600190602084019061010f565b50506101aa565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061015057805160ff191683800117855561017d565b8280016001018555821561017d579182015b8281111561017d578251825591602001919060010190610162565b5061018992915061018d565b5090565b6101a791905b808211156101895760008155600101610193565b90565b61031e806101b96000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c8063368b87721461004657806341c0e1b5146100ee578063ce6d41de146100f6575b600080fd5b6100ec6004803603602081101561005c57600080fd5b81019060208101813564010000000081111561007757600080fd5b82018360208201111561008957600080fd5b803590602001918460018302840111640100000000831117156100ab57600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610173945050505050565b005b6100ec6101a2565b6100fe6101ba565b6040805160208082528351818301528351919283929083019185019080838360005b83811015610138578181015183820152602001610120565b50505050905090810190601f1680156101655780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b6000546001600160a01b0316331461018a5761019f565b805161019d906001906020840190610250565b505b50565b6000546001600160a01b03163314156101b85733ff5b565b60018054604080516020601f600260001961010087891615020190951694909404938401819004810282018101909252828152606093909290918301828280156102455780601f1061021a57610100808354040283529160200191610245565b820191906000526020600020905b81548152906001019060200180831161022857829003601f168201915b505050505090505b90565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061029157805160ff19168380011785556102be565b828001600101855582156102be579182015b828111156102be5782518255916020019190600101906102a3565b506102ca9291506102ce565b5090565b61024d91905b808211156102ca57600081556001016102d456fea264697066735822122084964d4c3f6bc912a9d20e14e449721012d625aa3c8a12de41ae5519752fc89064736f6c63430006000033`)
 
 	resp, err := NewFileCreateTransaction().
 		SetKeys(client.GetOperatorPublicKey()).

executable.go

@@ -3,6 +3,8 @@ package hedera
 import (
 	"context"
 	"github.com/pkg/errors"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"math"
 	"time"
 
@@ -63,24 +65,19 @@ func execute(
 	maxAttempts := 10
 	var attempt int64
 	var errPersistent error
-	var stat Status
+	var responseStatus Status
+
 	if request.query != nil {
 		maxAttempts = request.query.maxRetry
 	} else {
 		maxAttempts = request.transaction.maxRetry
 	}
 
-	for attempt := int64(0); attempt < int64(maxAttempts); attempt++ {
+	for attempt = int64(0); attempt < int64(maxAttempts); attempt++ {
 		protoRequest := makeRequest(request)
 		nodeAccountID := getNodeAccountID(request)
+
 		node, ok := client.network.networkNodes[nodeAccountID]
-		//grpcErr, _ := status.FromError(errPersistent)
-		//if grpcErr.Code() == codes.Unavailable {
-		//	println("in trans grpc error")
-		//	fmt.Printf("%+v\n", grpcErr.Message())
-		//	time.Sleep(60 * time.Second)
-		//	errPersistent = nil
-		//}
 		if !ok {
 			return intermediateResponse{}, ErrInvalidNodeAccountIDSet{nodeAccountID}
 		}
@@ -101,46 +98,33 @@ func execute(
 		}
 
 		if method.query != nil {
-			r, err := method.query(context.TODO(), protoRequest.query)
-			if err != nil {
-				node.increaseDelay()
-				errPersistent = err
-				continue
-			}
-
-			resp.query = r
+			resp.query, err = method.query(context.TODO(), protoRequest.query)
 		} else {
-			r, err := method.transaction(context.TODO(), protoRequest.transaction)
-			if err != nil {
-				errPersistent = err
-				//grpcErr, _ := status.FromError(err)
-				//if grpcErr.Code() == codes.Unavailable{
-				//	println("in trans grpc error")
-				//	fmt.Printf("%+v\n", grpcErr.Message())
-				//	node.increaseDelay()
-				//	delayForAttempt(attempt)
-				//	continue
-				//}
+			resp.transaction, err = method.transaction(context.TODO(), protoRequest.transaction)
+		}
+
+		if err != nil {
+			errPersistent = err
+			if grpcErr, ok := status.FromError(err); ok && (grpcErr.Code() == codes.Unavailable || grpcErr.Code() == codes.ResourceExhausted) {
 				node.increaseDelay()
+				continue
 			}
-
-			resp.transaction = r
 		}
 
 		node.decreaseDelay()
 
-		stat = mapResponseStatus(request, resp)
+		responseStatus = mapResponseStatus(request, resp)
 
-		if shouldRetry(stat, resp) && attempt <= int64(maxAttempts) {
+		if shouldRetry(responseStatus, resp) && attempt <= int64(maxAttempts) {
 			delayForAttempt(attempt)
 			continue
 		}
 
-		if stat != StatusOk && stat != StatusSuccess {
+		if responseStatus != StatusOk && responseStatus != StatusSuccess {
 			if request.query != nil {
-				return intermediateResponse{}, newErrHederaPreCheckStatus(TransactionID{}, stat)
+				return intermediateResponse{}, newErrHederaPreCheckStatus(TransactionID{}, responseStatus)
 			} else {
-				return intermediateResponse{}, newErrHederaPreCheckStatus(request.transaction.GetTransactionID(), stat)
+				return intermediateResponse{}, newErrHederaPreCheckStatus(request.transaction.GetTransactionID(), responseStatus)
 			}
 		}
 

transfer_transaction_test.go

@@ -1,6 +1,7 @@
 package hedera
 
 import (
+	"fmt"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
@@ -33,12 +34,10 @@ func TestCryptoTransferTransactionNothing_Execute(t *testing.T) {
 func TestCryptoTransferTransaction1000_Execute(t *testing.T) {
 	client := newTestClient(t)
 	var err error
-	tx := make([]*TransferTransaction, 1000)
+	tx := make([]*TransferTransaction, 500)
 	response := make([]TransactionResponse, len(tx))
 	receipt := make([]TransactionReceipt, len(tx))
 
-	println("Building transactions")
-
 	for i := 0; i < len(tx); i++ {
 		tx[i], err = NewTransferTransaction().
 			AddHbarTransfer(client.GetOperatorAccountID(), HbarFromTinybar(-10)).
@@ -48,34 +47,22 @@ func TestCryptoTransferTransaction1000_Execute(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-	}
 
-	println("Signing transactions")
+		fmt.Printf("%+v\n", tx[i].GetNodeAccountIDs())
 
-	for _, tx := range tx {
-		_, err = tx.SignWithOperator(client)
+		_, err = tx[i].SignWithOperator(client)
 		if err != nil {
 			panic(err)
 		}
-	}
-
-	println("Executing transactions")
 
-	for i, tx := range tx {
-		response[i], err = tx.Execute(client)
+		response[i], err = tx[i].Execute(client)
 		if err != nil {
 			panic(err)
 		}
-	}
-
-	println("Fetching receipts")
 
-	for i, response := range response {
-		receipt[i], err = response.GetReceipt(client)
+		receipt[i], err = response[i].GetReceipt(client)
 		if err != nil {
 			panic(err)
 		}
-
-		println(response.TransactionID.String())
 	}
 }