fix: token_info nil de-reference fixed, SetNodeAccountID to SetNodeAc…

…countIDs
hiero-ledger · Oct 29, 2020 · 65bc24b · 65bc24b
1 parent e2fe93f
commit 65bc24b
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 37 deletions.
diff --git a/token_associate_transaction_test.go b/token_associate_transaction_test.go
@@ -19,7 +19,6 @@ func TestTokenAssociateTransaction_Execute(t *testing.T) {
 	var err error
 	client, err = ClientFromJsonFile(os.Getenv("CONFIG_FILE"))
 
-
 	if err != nil {
 		client = ClientForTestnet()
 	}
@@ -72,7 +71,7 @@ func TestTokenAssociateTransaction_Execute(t *testing.T) {
 		SetKycKey(operatorKey.PublicKey()).
 		SetSupplyKey(operatorKey.PublicKey()).
 		SetFreezeDefault(false).
-		SetExpirationTime(uint64(time.Now().Unix() + 86400 * 90)).
+		SetExpirationTime(uint64(time.Now().Unix() + 86400*90)).
 		Execute(client)
 	assert.NoError(t, err)
 

diff --git a/token_dissociate_transaction.go b/token_dissociate_transaction.go
@@ -224,7 +224,7 @@ func (transaction *TokenDissociateTransaction) GetNodeAccountIDs() []AccountID {
 }
 
 // SetNodeTokenID sets the node TokenID for this TokenDissociateTransaction.
-func (transaction *TokenDissociateTransaction) SetNodeAccountID(nodeID []AccountID) *TokenDissociateTransaction {
+func (transaction *TokenDissociateTransaction) SetNodeAccountIDs(nodeID []AccountID) *TokenDissociateTransaction {
 	transaction.requireNotFrozen()
 	transaction.Transaction.SetNodeAccountIDs(nodeID)
 	return transaction

diff --git a/token_info.go b/token_info.go
@@ -22,55 +22,70 @@ type TokenInfo struct {
 }
 
 func freezeStatusFromProtobuf(pb *proto.TokenFreezeStatus) *bool {
-	var freezeStatus *bool
+	var freezeStatus bool
 	switch pb.Number() {
 	case 1:
-		*freezeStatus = true
+		freezeStatus = true
 	case 2:
-		*freezeStatus = false
+		freezeStatus = false
 	default:
-		freezeStatus = nil
+		return nil
 	}
 
-	return freezeStatus
+	return &freezeStatus
 }
 
 func kycStatusFromProtobuf(pb *proto.TokenKycStatus) *bool {
-	var kycStatus *bool
+	var kycStatus bool
 	switch pb.Number() {
 	case 1:
-		*kycStatus = true
+		kycStatus = true
 	case 2:
-		*kycStatus = false
+		kycStatus = false
 	default:
-		kycStatus = nil
+		return nil
 	}
-	return kycStatus
+	return &kycStatus
 }
 
 func tokenInfoFromProtobuf(tokenInfo *proto.TokenInfo) TokenInfo {
+	var adminKey PublicKey
+	if tokenInfo.AdminKey != nil {
+		adminKey = PublicKey{keyData: tokenInfo.AdminKey.GetEd25519()}
+	}
+
+	var kycKey PublicKey
+	if tokenInfo.KycKey != nil {
+		kycKey = PublicKey{keyData: tokenInfo.KycKey.GetEd25519()}
+	}
+
+	var freezeKey PublicKey
+	if tokenInfo.FreezeKey != nil {
+		freezeKey = PublicKey{keyData: tokenInfo.FreezeKey.GetEd25519()}
+	}
+
+	var wipeKey PublicKey
+	if tokenInfo.WipeKey != nil {
+		wipeKey = PublicKey{keyData: tokenInfo.WipeKey.GetEd25519()}
+	}
+
+	var supplyKey PublicKey
+	if tokenInfo.SupplyKey != nil {
+		supplyKey = PublicKey{keyData: tokenInfo.SupplyKey.GetEd25519()}
+	}
+
 	return TokenInfo{
-		TokenID:     tokenIDFromProtobuf(tokenInfo.TokenId),
-		Name:        tokenInfo.Name,
-		Symbol:      tokenInfo.Symbol,
-		Decimals:    tokenInfo.Decimals,
-		TotalSupply: tokenInfo.TotalSupply,
-		Treasury:    accountIDFromProtobuf(tokenInfo.Treasury),
-		AdminKey: PublicKey{
-			keyData: tokenInfo.AdminKey.GetEd25519(),
-		},
-		KycKey: PublicKey{
-			keyData: tokenInfo.KycKey.GetEd25519(),
-		},
-		FreezeKey: PublicKey{
-			keyData: tokenInfo.FreezeKey.GetEd25519(),
-		},
-		WipeKey: PublicKey{
-			keyData: tokenInfo.WipeKey.GetEd25519(),
-		},
-		SupplyKey: PublicKey{
-			keyData: tokenInfo.SupplyKey.GetEd25519(),
-		},
+		TokenID:             tokenIDFromProtobuf(tokenInfo.TokenId),
+		Name:                tokenInfo.Name,
+		Symbol:              tokenInfo.Symbol,
+		Decimals:            tokenInfo.Decimals,
+		TotalSupply:         tokenInfo.TotalSupply,
+		Treasury:            accountIDFromProtobuf(tokenInfo.Treasury),
+		AdminKey:            adminKey,
+		KycKey:              kycKey,
+		FreezeKey:           freezeKey,
+		WipeKey:             wipeKey,
+		SupplyKey:           supplyKey,
 		DefaultFreezeStatus: freezeStatusFromProtobuf(&tokenInfo.DefaultFreezeStatus),
 		DefaultKycStatus:    kycStatusFromProtobuf(&tokenInfo.DefaultKycStatus),
 		IsDelete:            tokenInfo.IsDeleted,

diff --git a/token_transfer_transaction_test.go b/token_transfer_transaction_test.go
@@ -19,7 +19,6 @@ func TestTokenTransferTransaction_Execute(t *testing.T) {
 	var err error
 	client, err = ClientFromJsonFile(os.Getenv("CONFIG_FILE"))
 
-
 	if err != nil {
 		client = ClientForTestnet()
 	}
@@ -60,7 +59,7 @@ func TestTokenTransferTransaction_Execute(t *testing.T) {
 	assert.NoError(t, err)
 
 	accountID := *receipt.AccountID
-	
+
 	println("2")
 	resp, err = NewTokenCreateTransaction().
 		SetName("ffff").
@@ -74,7 +73,7 @@ func TestTokenTransferTransaction_Execute(t *testing.T) {
 		SetKycKey(operatorKey.PublicKey()).
 		SetSupplyKey(operatorKey.PublicKey()).
 		SetFreezeDefault(false).
-		SetExpirationTime(uint64(time.Now().Unix() + 86400 * 90)).
+		SetExpirationTime(uint64(time.Now().Unix() + 86400*90)).
 		Execute(client)
 	assert.NoError(t, err)