Executable refactor

account_allowance_adjust_transaction_unit_test.go

@@ -97,7 +97,7 @@ func TestUnitAccountAllowanceAdjustTransactionGet(t *testing.T) {
 	require.Equal(t, 1, tx.GetMaxRetry())
 	require.Equal(t, time.Second*120, tx.GetMaxBackoff())
 	require.Equal(t, time.Second*1, tx.GetMinBackoff())
-	require.Equal(t, fmt.Sprintf("AccountAllowanceAdjustTransaction:%v", transactionID.ValidStart.UnixNano()), tx._GetLogID())
+	require.Equal(t, fmt.Sprint("AccountAllowanceAdjustTransaction"), tx.getName())
 }
 
 func TestUnitAccountAllowanceAdjustTransactionGrantHbarAllowance(t *testing.T) {

account_allowance_approve_transaction_unit_test.go

@@ -24,14 +24,10 @@ package hedera
  */
 
 import (
-	"testing"
-	"time"
-
-	protobuf "google.golang.org/protobuf/proto"
-
 	"github.com/hashgraph/hedera-protobufs-go/services"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/wrapperspb"
+	"testing"
 )
 
 var tokenID1 = TokenID{Token: 1}
@@ -64,7 +60,7 @@ func TestUnitAccountAllowanceApproveTransaction(t *testing.T) {
 		Freeze()
 	require.NoError(t, err)
 
-	data := transaction._Build()
+	data := transaction.build()
 
 	switch d := data.Data.(type) {
 	case *services.TransactionBody_CryptoApproveAllowance:
@@ -111,27 +107,26 @@ func TestUnitAccountAllowanceApproveTransaction(t *testing.T) {
 		})
 	}
 }
-func TestUnit_ValidateNetworkOnIDs(t *testing.T){
+func TestUnitvalidateNetworkOnIDs(t *testing.T) {
 	transactionID := TransactionIDGenerate(AccountID{Account: 324})
 
-
 	transaction, err := NewAccountAllowanceApproveTransaction().
-	SetTransactionID(transactionID).
-	SetNodeAccountIDs(nodeAccountID).
-	ApproveHbarAllowance(owner, spenderAccountID1, hbarAmount).
-	ApproveTokenAllowance(tokenID1, owner, spenderAccountID1, tokenAmount).
-	ApproveTokenNftAllowance(nftID1, owner, spenderAccountID1).
-	ApproveTokenNftAllowance(nftID2, owner, spenderAccountID1).
-	ApproveTokenNftAllowance(nftID2, owner, spenderAccountID2).
-	AddAllTokenNftApproval(tokenID1, spenderAccountID1).
-	Freeze()
+		SetTransactionID(transactionID).
+		SetNodeAccountIDs(nodeAccountID).
+		ApproveHbarAllowance(owner, spenderAccountID1, hbarAmount).
+		ApproveTokenAllowance(tokenID1, owner, spenderAccountID1, tokenAmount).
+		ApproveTokenNftAllowance(nftID1, owner, spenderAccountID1).
+		ApproveTokenNftAllowance(nftID2, owner, spenderAccountID1).
+		ApproveTokenNftAllowance(nftID2, owner, spenderAccountID2).
+		AddAllTokenNftApproval(tokenID1, spenderAccountID1).
+		Freeze()
 	require.NoError(t, err)
 
 	client, err := _NewMockClient()
 	client.SetLedgerID(*NewLedgerIDTestnet())
 	require.NoError(t, err)
 
-	e := transaction._ValidateNetworkOnIDs(client)
+	e := transaction.validateNetworkOnIDs(client)
 	require.NoError(t, e)
 }
 func TestUnitAccountAllowanceApproveTransactionGet(t *testing.T) {
@@ -193,33 +188,6 @@ func TestUnitAccountAllowanceApproveTransactionSetNothing(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestUnitAccountAllowanceDeleteTransactionSetNothing(t *testing.T) {
-	t.Parallel()
-
-	token := TokenID{Token: 3}
-	nodeAccountID := []AccountID{{Account: 10}, {Account: 11}, {Account: 12}}
-	transactionID := TransactionIDGenerate(AccountID{Account: 324})
-
-	transaction, err := NewAccountAllowanceDeleteTransaction().
-		SetTransactionID(transactionID).
-		SetNodeAccountIDs(nodeAccountID).
-		DeleteAllTokenNftAllowances(token.Nft(4), &AccountID{Account: 3}).
-		Freeze()
-	require.NoError(t, err)
-
-	transaction.GetTransactionID()
-	transaction.GetNodeAccountIDs()
-
-	_, err = transaction.GetTransactionHash()
-	require.NoError(t, err)
-	transaction.GetAllTokenNftDeleteAllowances()
-	transaction.GetMaxTransactionFee()
-	transaction.GetTransactionMemo()
-	transaction.GetRegenerateTransactionID()
-	_, err = transaction.GetSignatures()
-	require.NoError(t, err)
-}
-
 func TestUnitAccountAllowanceApproveTransactionFromProtobuf(t *testing.T) {
 	t.Parallel()
 
@@ -236,7 +204,7 @@ func TestUnitAccountAllowanceApproveTransactionFromProtobuf(t *testing.T) {
 		Freeze()
 	require.NoError(t, err)
 
-	txFromProto := _AccountAllowanceApproveTransactionFromProtobuf(tx.Transaction, tx._Build())
+	txFromProto := _AccountAllowanceApproveTransactionFromProtobuf(tx.Transaction, tx.build())
 	require.Equal(t, tx, txFromProto)
 }
 
@@ -296,118 +264,7 @@ func TestUnitAccountAllowanceApproveTransactionScheduleProtobuf(t *testing.T) {
 			},
 		},
 	}
-	actual, err := tx._ConstructScheduleProtobuf()
+	actual, err := tx.buildScheduled()
 	require.NoError(t, err)
 	require.Equal(t, expected.String(), actual.String())
 }
-
-func TestUnitAccountAllowanceDeleteTransactionCoverage(t *testing.T) {
-	t.Parallel()
-
-	checksum := "dmqui"
-	token := TokenID{Token: 3, checksum: &checksum}
-	account := AccountID{Account: 3, checksum: &checksum}
-	nodeAccountID := []AccountID{{Account: 10}}
-	transactionID := TransactionIDGenerate(AccountID{Account: 324})
-
-	newKey, err := PrivateKeyGenerateEd25519()
-	require.NoError(t, err)
-
-	client, err := _NewMockClient()
-	client.SetLedgerID(*NewLedgerIDTestnet())
-	require.NoError(t, err)
-	client.SetAutoValidateChecksums(true)
-
-	transaction, err := NewAccountAllowanceDeleteTransaction().
-		SetTransactionID(transactionID).
-		SetNodeAccountIDs(nodeAccountID).
-		DeleteAllTokenNftAllowances(token.Nft(4), &account).
-		DeleteAllTokenNftAllowances(token.Nft(5), &account).
-		SetMaxTransactionFee(NewHbar(3)).
-		SetMaxRetry(3).
-		DeleteAllHbarAllowances(&account).
-		DeleteAllTokenAllowances(token, &account).
-		SetMaxBackoff(time.Second * 30).
-		SetMinBackoff(time.Second * 10).
-		SetTransactionMemo("no").
-		SetTransactionValidDuration(time.Second * 30).
-		SetRegenerateTransactionID(false).
-		Freeze()
-	require.NoError(t, err)
-
-	transaction._ValidateNetworkOnIDs(client)
-
-	_, err = transaction.Schedule()
-	require.NoError(t, err)
-	transaction.GetTransactionID()
-	transaction.GetNodeAccountIDs()
-	transaction.GetMaxRetry()
-	transaction.GetMaxTransactionFee()
-	transaction.GetMaxBackoff()
-	transaction.GetMinBackoff()
-	transaction.GetRegenerateTransactionID()
-	byt, err := transaction.ToBytes()
-	require.NoError(t, err)
-	txFromBytesI, err := TransactionFromBytes(byt)
-	require.NoError(t, err)
-	txFromBytes, ok := txFromBytesI.(AccountAllowanceDeleteTransaction)
-	require.Equal(t, true, ok)
-	sig, err := newKey.SignTransaction(&transaction.Transaction)
-	require.NoError(t, err)
-
-	_, err = transaction.GetTransactionHash()
-	require.NoError(t, err)
-	transaction.GetAllTokenNftDeleteAllowances()
-	transaction.GetMaxTransactionFee()
-	transaction.GetTransactionMemo()
-	transaction.GetRegenerateTransactionID()
-	_, err = transaction.GetSignatures()
-	require.NoError(t, err)
-	transaction.GetAllHbarDeleteAllowances()
-	transaction.GetAllTokenDeleteAllowances()
-	transaction._GetLogID()
-	txFromBytes.AddSignature(newKey.PublicKey(), sig)
-}
-
-func TestUnitAccountAllowanceDeleteTransactionMock(t *testing.T) {
-	t.Parallel()
-
-	checksum := "dmqui"
-	token := TokenID{Token: 3, checksum: &checksum}
-	nodeAccountID := []AccountID{{Account: 3}}
-	transactionID := TransactionIDGenerate(AccountID{Account: 3})
-
-	call := func(request *services.Transaction) *services.TransactionResponse {
-		require.NotEmpty(t, request.SignedTransactionBytes)
-		signedTransaction := services.SignedTransaction{}
-		_ = protobuf.Unmarshal(request.SignedTransactionBytes, &signedTransaction)
-
-		require.NotEmpty(t, signedTransaction.BodyBytes)
-		transactionBody := services.TransactionBody{}
-		_ = protobuf.Unmarshal(signedTransaction.BodyBytes, &transactionBody)
-
-		require.NotNil(t, transactionBody.TransactionID)
-		transactionId := transactionBody.TransactionID.String()
-		require.NotEqual(t, "", transactionId)
-
-		sigMap := signedTransaction.GetSigMap()
-		require.NotNil(t, sigMap)
-
-		return &services.TransactionResponse{
-			NodeTransactionPrecheckCode: services.ResponseCodeEnum_OK,
-		}
-	}
-	responses := [][]interface{}{{
-		call,
-	}}
-
-	client, server := NewMockClientAndServer(responses)
-	defer server.Close()
-
-	_, err := NewAccountAllowanceDeleteTransaction().
-		SetTransactionID(transactionID).
-		SetNodeAccountIDs(nodeAccountID).
-		DeleteAllTokenNftAllowances(token.Nft(4), &AccountID{Account: 3}).
-		Execute(client)
-	require.NoError(t, err)
-}