Skip to content

Commit 2a3d5ce

Browse files
0xivanov0xivanov
committed
chore: revert freeze changes
Signed-off-by: Ivan Ivanov <ivanivanov.ii726@gmail.com>
1 parent 6772a77 commit 2a3d5ce

4 files changed

Lines changed: 49 additions & 39 deletions

File tree

‎sdk/node_create_transaction_unit_test.go‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,10 @@ func TestUnitNodeCreateTransactionGossipEndpointsValidation(t *testing.T) {
434434
tx.AddGossipEndpoint(endpoint)
435435
}
436436

437-
_, err := tx.Freeze()
437+
tx, err := tx.Freeze()
438438

439-
require.Error(t, err)
440-
assert.ErrorIs(t, err, errTooManyGossipEndpoints)
439+
require.NoError(t, err)
440+
assert.ErrorIs(t, tx.freezeError, errTooManyGossipEndpoints)
441441
})
442442

443443
t.Run("GossipEndpointWithNoAddressOrDomainName", func(t *testing.T) {
@@ -449,10 +449,10 @@ func TestUnitNodeCreateTransactionGossipEndpointsValidation(t *testing.T) {
449449
invalidEndpoint := Endpoint{}
450450
tx.AddGossipEndpoint(invalidEndpoint)
451451

452-
_, err := tx.Freeze()
452+
tx, err := tx.Freeze()
453453

454-
require.Error(t, err)
455-
assert.ErrorIs(t, err, errEndpointMustHaveAddressOrDomainName)
454+
require.NoError(t, err)
455+
assert.ErrorIs(t, tx.freezeError, errEndpointMustHaveAddressOrDomainName)
456456
})
457457

458458
t.Run("GossipEndpointWithBothAddressOrDomainName", func(t *testing.T) {
@@ -466,10 +466,10 @@ func TestUnitNodeCreateTransactionGossipEndpointsValidation(t *testing.T) {
466466
invalidEndpoint.SetDomainName("example.com")
467467
tx.AddGossipEndpoint(invalidEndpoint)
468468

469-
_, err := tx.Freeze()
469+
tx, err := tx.Freeze()
470470

471-
require.Error(t, err)
472-
assert.ErrorIs(t, err, errEndpointCannotHaveBothAddressAndDomainName)
471+
require.NoError(t, err)
472+
assert.ErrorIs(t, tx.freezeError, errEndpointCannotHaveBothAddressAndDomainName)
473473
})
474474

475475
t.Run("ValidGossipEndpoints", func(t *testing.T) {
@@ -510,10 +510,10 @@ func TestUnitNodeCreateTransactionServiceEndpointsValidation(t *testing.T) {
510510
tx.AddServiceEndpoint(endpoint)
511511
}
512512

513-
_, err := tx.Freeze()
513+
tx, err := tx.Freeze()
514514

515-
require.Error(t, err)
516-
assert.ErrorIs(t, err, errTooManyServiceEndpoints)
515+
require.NoError(t, err)
516+
assert.ErrorIs(t, tx.freezeError, errTooManyServiceEndpoints)
517517
})
518518

519519
t.Run("ServiceEndpointWithNoAddressOrDomainName", func(t *testing.T) {
@@ -525,10 +525,10 @@ func TestUnitNodeCreateTransactionServiceEndpointsValidation(t *testing.T) {
525525
invalidEndpoint := Endpoint{}
526526
tx.AddServiceEndpoint(invalidEndpoint)
527527

528-
_, err := tx.Freeze()
528+
tx, err := tx.Freeze()
529529

530-
require.Error(t, err)
531-
assert.ErrorIs(t, err, errEndpointMustHaveAddressOrDomainName)
530+
require.NoError(t, err)
531+
assert.ErrorIs(t, tx.freezeError, errEndpointMustHaveAddressOrDomainName)
532532
})
533533

534534
t.Run("ServiceEndpointWithBothAddressOrDomainName", func(t *testing.T) {
@@ -542,10 +542,10 @@ func TestUnitNodeCreateTransactionServiceEndpointsValidation(t *testing.T) {
542542
invalidEndpoint.SetDomainName("example.com")
543543
tx.AddServiceEndpoint(invalidEndpoint)
544544

545-
_, err := tx.Freeze()
545+
tx, err := tx.Freeze()
546546

547-
require.Error(t, err)
548-
assert.ErrorIs(t, err, errEndpointCannotHaveBothAddressAndDomainName)
547+
require.NoError(t, err)
548+
assert.ErrorIs(t, tx.freezeError, errEndpointCannotHaveBothAddressAndDomainName)
549549
})
550550

551551
t.Run("ValidServiceEndpoints", func(t *testing.T) {
@@ -584,10 +584,10 @@ func TestUnitNodeCreateTransactionGrpcWebProxyEndpointValidation(t *testing.T) {
584584
// No address or domain name set, making it invalid
585585
tx.SetGrpcWebProxyEndpoint(invalidEndpoint)
586586

587-
_, err := tx.Freeze()
587+
tx, err := tx.Freeze()
588588

589-
require.Error(t, err)
590-
assert.ErrorIs(t, err, errEndpointMustHaveAddressOrDomainName)
589+
require.NoError(t, err)
590+
assert.ErrorIs(t, tx.freezeError, errEndpointMustHaveAddressOrDomainName)
591591
})
592592

593593
t.Run("GrpcWebProxyEndpointWithBothAddressOrDomainName", func(t *testing.T) {
@@ -600,9 +600,9 @@ func TestUnitNodeCreateTransactionGrpcWebProxyEndpointValidation(t *testing.T) {
600600
invalidEndpoint.SetAddress([]byte{192, 168, 1, 1})
601601
invalidEndpoint.SetDomainName("example.com")
602602
tx.SetGrpcWebProxyEndpoint(invalidEndpoint)
603-
_, err := tx.Freeze()
604-
require.Error(t, err)
605-
assert.ErrorIs(t, err, errEndpointCannotHaveBothAddressAndDomainName)
603+
tx, err := tx.Freeze()
604+
require.NoError(t, err)
605+
assert.ErrorIs(t, tx.freezeError, errEndpointCannotHaveBothAddressAndDomainName)
606606
})
607607

608608
t.Run("ValidGrpcWebProxyEndpoint", func(t *testing.T) {
@@ -650,10 +650,10 @@ func TestUnitNodeCreateTransactionGossipCaCertificateValidation(t *testing.T) {
650650
// Set an empty gossip CA certificate
651651
tx.SetGossipCaCertificate([]byte{})
652652

653-
_, err := tx.Freeze()
653+
tx, err := tx.Freeze()
654654

655-
require.Error(t, err)
656-
assert.ErrorIs(t, err, errGossipCaCertificateEmpty)
655+
require.NoError(t, err)
656+
assert.ErrorIs(t, tx.freezeError, errGossipCaCertificateEmpty)
657657
})
658658

659659
t.Run("ValidGossipCaCertificate", func(t *testing.T) {
@@ -697,10 +697,10 @@ func TestUnitNodeCreateTransactionDescriptionValidation(t *testing.T) {
697697
longDescription := strings.Repeat("a", 101)
698698
tx.SetDescription(longDescription)
699699

700-
_, err := tx.Freeze()
700+
tx, err := tx.Freeze()
701701

702-
require.Error(t, err)
703-
assert.ErrorIs(t, err, errDescriptionTooLong)
702+
require.NoError(t, err)
703+
assert.ErrorIs(t, tx.freezeError, errDescriptionTooLong)
704704
})
705705

706706
t.Run("DescriptionAtLimit", func(t *testing.T) {

‎sdk/node_delete_transaction_unit_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,8 @@ func TestUnitNodeDeleteTransactionFailsWenNodeIDIsNotSet(t *testing.T) {
259259
SetNodeAccountIDs(nodeAccountID).
260260
Freeze()
261261

262-
require.Error(t, err)
263-
require.ErrorIs(t, errNodeIdIsRequired, transaction.freezeError)
264-
assert.ErrorIs(t, errNodeIdIsRequired, err)
262+
require.NoError(t, err)
263+
264+
require.Error(t, transaction.freezeError)
265+
assert.ErrorIs(t, errNodeIdIsRequired, transaction.freezeError)
265266
}

‎sdk/node_update_transaction_unit_test.go‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,10 +431,19 @@ func TestUnitNodeUpdateTransactionFailsWenNodeIDIsNotSet(t *testing.T) {
431431
nodeAccountID := []AccountID{{Account: 10}}
432432
transactionID := TransactionIDGenerate(AccountID{Account: 324})
433433

434-
_, err := NewNodeUpdateTransaction().
434+
transaction, err := NewNodeUpdateTransaction().
435435
SetTransactionID(transactionID).
436436
SetNodeAccountIDs(nodeAccountID).
437437
Freeze()
438+
require.NoError(t, err)
439+
440+
require.Error(t, transaction.freezeError)
441+
assert.ErrorIs(t, errNodeIdIsRequired, transaction.freezeError)
442+
443+
client, err := _NewMockClient()
444+
client.SetLedgerID(*NewLedgerIDTestnet())
445+
require.NoError(t, err)
446+
447+
_, err = transaction.Execute(client)
438448
require.Error(t, err)
439-
assert.ErrorIs(t, err, errNodeIdIsRequired)
440449
}

‎sdk/transaction.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,10 @@ func (tx *Transaction[T]) Execute(client *Client) (TransactionResponse, error) {
14281428
}
14291429
}
14301430

1431+
if tx.freezeError != nil {
1432+
return TransactionResponse{}, tx.freezeError
1433+
}
1434+
14311435
transactionID := tx.transactionIDs._GetCurrent().(TransactionID)
14321436

14331437
if !client.GetOperatorAccountID()._IsZero() && client.GetOperatorAccountID()._Equals(*transactionID.AccountID) {
@@ -1530,10 +1534,6 @@ func (tx *Transaction[T]) FreezeWith(client *Client) (T, error) {
15301534
})
15311535
}
15321536

1533-
if tx.freezeError != nil {
1534-
return tx.childTransaction, tx.freezeError
1535-
}
1536-
15371537
return tx.childTransaction, nil
15381538
}
15391539

0 commit comments

Comments
 (0)