Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes #810

Merged
merged 1 commit into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion file_append_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func _FileAppendTransactionFromProtobuf(transaction Transaction, pb *services.Tr
return &FileAppendTransaction{
Transaction: transaction,
maxChunks: 20,
contents: make([]byte, 0),
contents: pb.GetFileAppend().GetContents(),
chunkSize: 2048,
fileID: _FileIDFromProtobuf(pb.GetFileAppend().GetFileID()),
}
Expand Down
29 changes: 29 additions & 0 deletions file_append_transaction_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,32 @@ func TestUnitFileAppendTransactionCoverage(t *testing.T) {
b.AddSignature(newKey.PublicKey(), sig)
}
}

func TestUnitFileAppendTransactionSerialization(t *testing.T) {
t.Parallel()

fileID := FileID{File: 7}
nodeAccountID := []AccountID{{Account: 10}}
transactionID := TransactionIDGenerate(AccountID{Account: 324})

transaction, err := NewFileAppendTransaction().
SetTransactionID(transactionID).
SetNodeAccountIDs(nodeAccountID).
SetFileID(fileID).
SetContents([]byte("Hello, World")).
Freeze()
require.NoError(t, err)

txBytes, err := transaction.ToBytes()
require.NoError(t, err)

txParsed, err := TransactionFromBytes(txBytes)
require.NoError(t, err)

result, ok := txParsed.(FileAppendTransaction)
require.True(t, ok)

require.Equal(t, transactionID.AccountID, result.GetTransactionID().AccountID)
require.Equal(t, fileID, result.GetFileID())
require.Equal(t, transaction.GetContents(), result.GetContents())
}
2 changes: 1 addition & 1 deletion token_create_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ func (transaction *TokenCreateTransaction) Freeze() (*TokenCreateTransaction, er
}

func (transaction *TokenCreateTransaction) FreezeWith(client *Client) (*TokenCreateTransaction, error) {
if transaction.autoRenewPeriod != nil && client != nil && !client.GetOperatorAccountID()._IsZero() {
if transaction.autoRenewAccountID == nil && transaction.autoRenewPeriod != nil && client != nil && !client.GetOperatorAccountID()._IsZero() {
transaction.SetAutoRenewAccount(client.GetOperatorAccountID())
}

Expand Down
11 changes: 11 additions & 0 deletions token_create_transaction_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,14 @@ func TestUnitTokenCreateTransactionMock(t *testing.T) {
_, err = freez.Sign(newKey).Execute(client)
require.NoError(t, err)
}

func TestUnitTokenCreateAutoRenewAccountSetting(t *testing.T) {
client, err := _NewMockClient()
autoRenewAccount := AccountID{Account: 3}
frozenTx, err := NewTokenCreateTransaction().
SetAutoRenewAccount(autoRenewAccount).
SetAutoRenewPeriod(24 * time.Hour).
FreezeWith(client)
require.NoError(t, err)
require.Equal(t, autoRenewAccount, frozenTx.GetAutoRenewAccount())
}
2 changes: 1 addition & 1 deletion topic_create_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func _TopicCreateTransactionFromProtobuf(transaction Transaction, pb *services.T
autoRenewAccountID: _AccountIDFromProtobuf(pb.GetConsensusCreateTopic().GetAutoRenewAccount()),
adminKey: adminKey,
submitKey: submitKey,
memo: pb.GetContractCreateInstance().GetMemo(),
memo: pb.GetConsensusCreateTopic().GetMemo(),
autoRenewPeriod: &autoRenew,
}
}
Expand Down
35 changes: 35 additions & 0 deletions topic_create_transaction_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,38 @@ func TestUnitTopicCreateTransactionMock(t *testing.T) {
_, err = freez.Sign(newKey).Execute(client)
require.NoError(t, err)
}

func TestUnitTopicCreateTransactionSerialization(t *testing.T) {
t.Parallel()

nodeAccountID := []AccountID{{Account: 10}}
transactionID := TransactionIDGenerate(AccountID{Account: 324})
newKey, err := PrivateKeyGenerateEd25519()
require.NoError(t, err)

topicCreate, err := NewTopicCreateTransaction().
SetTransactionID(transactionID).
SetAdminKey(newKey).
SetNodeAccountIDs(nodeAccountID).
SetSubmitKey(newKey).
SetTopicMemo("ad").
SetAutoRenewPeriod(time.Second * 30).
Freeze()
require.NoError(t, err)

transactionBytes, err := topicCreate.ToBytes()
require.NoError(t, err)

txParsed, err := TransactionFromBytes(transactionBytes)
require.NoError(t, err)

result, ok := txParsed.(TopicCreateTransaction)
require.True(t, ok)

require.Equal(t, topicCreate.GetTopicMemo(), result.GetTopicMemo())
require.Equal(t, topicCreate.GetAutoRenewPeriod(), result.GetAutoRenewPeriod())
adminKey, _ := result.GetAdminKey()
require.Equal(t, newKey.PublicKey(), adminKey)
submitKey, _ := result.GetSubmitKey()
require.Equal(t, newKey.PublicKey(), submitKey)
}
2 changes: 1 addition & 1 deletion topic_message_submit_transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func _TopicMessageSubmitTransactionFromProtobuf(transaction Transaction, pb *ser
tx := &TopicMessageSubmitTransaction{
Transaction: transaction,
maxChunks: 20,
message: make([]byte, 0),
message: pb.GetConsensusSubmitMessage().GetMessage(),
topicID: _TopicIDFromProtobuf(pb.GetConsensusSubmitMessage().GetTopicID()),
}

Expand Down
31 changes: 31 additions & 0 deletions topic_message_submit_transaction_unit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,34 @@ func TestUnitTopicMessageSubmitTransactionCoverage(t *testing.T) {
b.AddSignature(newKey.PublicKey(), sig)
}
}

func TestUnitTopicMessageSubmitTransactionSerialization(t *testing.T) {
t.Parallel()

topic := TopicID{Topic: 3}
nodeAccountID := []AccountID{{Account: 10}}
transactionID := TransactionIDGenerate(AccountID{Account: 324})

transaction, err := NewTopicMessageSubmitTransaction().
SetTransactionID(transactionID).
SetNodeAccountIDs(nodeAccountID).
SetTopicID(topic).
SetMessage([]byte("nothing to see here")).
SetMaxChunks(30).
SetTransactionMemo("no").
Freeze()
require.NoError(t, err)

txBytes, err := transaction.ToBytes()
require.NoError(t, err)

txParsed, err := TransactionFromBytes(txBytes)
require.NoError(t, err)

result, ok := txParsed.(TopicMessageSubmitTransaction)
require.True(t, ok)

require.Equal(t, transactionID.AccountID, result.GetTransactionID().AccountID)
require.Equal(t, transaction.GetMessage(), result.GetMessage())
require.Equal(t, transaction.GetTransactionMemo(), result.GetTransactionMemo())
}