fix: FileAppend, TopicMessageSubmit, TopicMessageQuery

hiero-ledger · Mar 12, 2021 · 6827643 · 6827643
1 parent bea7f8d
commit 6827643
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/errors.go b/errors.go
@@ -113,7 +113,7 @@ func newErrHederaPreCheckStatus(id TransactionID, status Status) ErrHederaPreChe
 
 // Error() implements the Error interface
 func (e ErrHederaPreCheckStatus) Error() string {
-	if e.TxID.AccountID.isZero() {
+	if e.TxID.AccountID == nil {
 		return fmt.Sprintf("exceptional precheck status %s", e.Status.String())
 	}
 	return fmt.Sprintf("exceptional precheck status %s received for transaction %v", e.Status.String(), e.TxID)

diff --git a/file_append_transaction.go b/file_append_transaction.go
@@ -271,7 +271,7 @@ func (transaction *FileAppendTransaction) FreezeWith(client *Client) (*FileAppen
 			end = len(transaction.contents)
 		}
 
-		transaction.transactionIDs = append(transaction.transactionIDs, nextTransactionID)
+		transaction.transactionIDs = append(transaction.transactionIDs, transactionIDFromProtobuf(nextTransactionID.toProtobuf()))
 
 		transaction.pb.Contents = transaction.contents[start:end]
 

diff --git a/topic_message_query.go b/topic_message_query.go
@@ -140,7 +140,7 @@ func (query *TopicMessageQuery) Subscribe(client *Client, onNext func(TopicMessa
 				onNext(topicMessageOfSingle(resp))
 			} else {
 				messagesMutex.Lock()
-				txID := transactionIDFromProtobuf(resp.ChunkInfo.InitialTransactionID)
+				txID := transactionIDFromProtobuf(resp.ChunkInfo.InitialTransactionID).String()
 				messageI, _ := messages.LoadOrStore(txID, make([]*mirror.ConsensusTopicResponse, 0, resp.ChunkInfo.Total))
 
 				message := messageI.([]*mirror.ConsensusTopicResponse)

diff --git a/topic_message_submit_transaction.go b/topic_message_submit_transaction.go
@@ -171,8 +171,12 @@ func (transaction *TopicMessageSubmitTransaction) ExecuteAll(
 	}
 
 	transactionID := transaction.GetTransactionID()
+	accountID := AccountID{}
+	if transactionID.AccountID != nil {
+		accountID = *transactionID.AccountID
+	}
 
-	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(*transactionID.AccountID) {
+	if !client.GetOperatorAccountID().isZero() && client.GetOperatorAccountID().equals(accountID) {
 		transaction.SignWith(
 			client.GetOperatorPublicKey(),
 			client.operator.signer,
@@ -234,7 +238,7 @@ func (transaction *TopicMessageSubmitTransaction) FreezeWith(client *Client) (*T
 	}
 
 	initialTransactionID := transaction.GetTransactionID()
-	nextTransactionID := initialTransactionID
+	nextTransactionID := transactionIDFromProtobuf(initialTransactionID.toProtobuf())
 
 	transaction.transactionIDs = make([]TransactionID, 0)
 	transaction.transactions = make([]*proto.Transaction, 0)
@@ -248,7 +252,7 @@ func (transaction *TopicMessageSubmitTransaction) FreezeWith(client *Client) (*T
 			end = len(transaction.message)
 		}
 
-		transaction.transactionIDs = append(transaction.transactionIDs, nextTransactionID)
+		transaction.transactionIDs = append(transaction.transactionIDs, transactionIDFromProtobuf(nextTransactionID.toProtobuf()))
 
 		transaction.pb.Message = transaction.message[start:end]
 		transaction.pb.ChunkInfo = &proto.ConsensusMessageChunkInfo{

diff --git a/utilities_for_test.go b/utilities_for_test.go
@@ -92,7 +92,7 @@ func newTestClient(t *testing.T) *Client {
 
 	resp, err := NewAccountCreateTransaction().
 		SetKey(newKey.PublicKey()).
-		SetInitialBalance(NewHbar(20)).
+		SetInitialBalance(NewHbar(100)).
 		Execute(client)
 	assert.NoError(t, err)