From 1cd5ef76b7c99b5aea3cfd1e1c4fd9b7af8e1829 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Wed, 12 Feb 2025 11:03:30 +0200 Subject: [PATCH] chore: standardize NftId string format (#1258) Signed-off-by: Ivan Ivanov --- sdk/nft_id.go | 8 ++++---- sdk/token_nft_info_query_unit_test.go | 4 ++-- sdk/token_transfer_transaction_unit_test.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/nft_id.go b/sdk/nft_id.go index 7ad5edf74..4679fcb27 100644 --- a/sdk/nft_id.go +++ b/sdk/nft_id.go @@ -24,12 +24,12 @@ func NftIDFromString(s string) (NftID, error) { if len(split) < 2 { panic(errors.New("wrong NftID format")) } - shard, realm, num, checksum, err := _IdFromString(split[1]) + shard, realm, num, checksum, err := _IdFromString(split[0]) if err != nil { return NftID{}, err } - serial, err := strconv.Atoi(split[0]) + serial, err := strconv.Atoi(split[1]) if err != nil { return NftID{}, err } @@ -60,7 +60,7 @@ func (id *NftID) Validate(client *Client) error { // String returns a string representation of the NftID func (id NftID) String() string { - return fmt.Sprintf("%d@%s", id.SerialNumber, id.TokenID.String()) + return fmt.Sprintf("%s@%d", id.TokenID.String(), id.SerialNumber) } // ToStringWithChecksum returns a string representation of the NftID with a checksum @@ -69,7 +69,7 @@ func (id NftID) ToStringWithChecksum(client Client) (string, error) { if err != nil { return "", err } - return fmt.Sprintf("%d@%s", id.SerialNumber, token), nil + return fmt.Sprintf("%s@%d", token, id.SerialNumber), nil } func (id NftID) _ToProtobuf() *services.NftID { diff --git a/sdk/token_nft_info_query_unit_test.go b/sdk/token_nft_info_query_unit_test.go index a3ce366ac..c438235b1 100644 --- a/sdk/token_nft_info_query_unit_test.go +++ b/sdk/token_nft_info_query_unit_test.go @@ -21,7 +21,7 @@ func TestUnitTokenNftGetInfoByNftIDValidate(t *testing.T) { client.SetLedgerID(*NewLedgerIDTestnet()) require.NoError(t, err) client.SetAutoValidateChecksums(true) - nftID, err := NftIDFromString("2@0.0.123-esxsf") + nftID, err := NftIDFromString("0.0.123-esxsf@2") require.NoError(t, err) nftInfo := NewTokenNftInfoQuery(). @@ -38,7 +38,7 @@ func TestUnitTokenNftGetInfoByNftIDValidateWrong(t *testing.T) { client.SetLedgerID(*NewLedgerIDTestnet()) require.NoError(t, err) client.SetAutoValidateChecksums(true) - nftID, err := NftIDFromString("2@0.0.123-rmkykd") + nftID, err := NftIDFromString("0.0.123-rmkykd@2") require.NoError(t, err) nftInfo := NewTokenNftInfoQuery(). diff --git a/sdk/token_transfer_transaction_unit_test.go b/sdk/token_transfer_transaction_unit_test.go index 0df474c1e..cce423a18 100644 --- a/sdk/token_transfer_transaction_unit_test.go +++ b/sdk/token_transfer_transaction_unit_test.go @@ -116,7 +116,7 @@ func TestUnitTokenTransferTransactionValidate(t *testing.T) { require.NoError(t, err) tokenID, err := TokenIDFromString("0.0.123-esxsf") require.NoError(t, err) - nftID, err := NftIDFromString("2@0.0.123-esxsf") + nftID, err := NftIDFromString("0.0.123-esxsf@2") require.NoError(t, err) tokenTransfer := NewTransferTransaction(). @@ -138,7 +138,7 @@ func TestUnitTokenTransferTransactionValidateWrong(t *testing.T) { require.NoError(t, err) tokenID, err := TokenIDFromString("0.0.123-rmkykd") require.NoError(t, err) - nftID, err := NftIDFromString("2@0.0.123-rmkykd") + nftID, err := NftIDFromString("0.0.123-rmkykd@2") require.NoError(t, err) tokenTransfer := NewTransferTransaction().