Skip to content

Commit

Permalink
fix: resolve codacy code analysis warnings
Browse files Browse the repository at this point in the history 
Signed-off-by: Ricky Saechao <ricky@launchbadge.com>
  • Loading branch information
@RickyLB
RickyLB committed Feb 14, 2025
1 parent 6888853 commit 114dd7c
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 69 deletions.
8 changes: 4 additions & 4 deletions Examples/ModifyTokenKeys/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ internal enum Program {
print("Removing Wipe Key...")

// Remove the wipe key with empty Keylist, signing with the admin key.
let _ = try await TokenUpdateTransaction()
_ = try await TokenUpdateTransaction()
.tokenId(tokenId)
.wipeKey(.keyList([]))
.keyVerificationMode(TokenKeyValidation.fullValidation)
Expand All @@ -90,7 +90,7 @@ internal enum Program {
print("Removing Admin Key...")

// Remove the admin key with empty Keylist, signing with the admin key.
let _ = try await TokenUpdateTransaction()
_ = try await TokenUpdateTransaction()
.tokenId(tokenId)
.adminKey(.keyList([]))
.keyVerificationMode(TokenKeyValidation.noValidation)
Expand All @@ -109,7 +109,7 @@ internal enum Program {
print("Update Supply Key...")

// Update the supply key with a new key, signing with the old supply key and the new supply key.
let _ = try await TokenUpdateTransaction()
_ = try await TokenUpdateTransaction()
.tokenId(tokenId)
.supplyKey(.single(newSupplyKey.publicKey))
.keyVerificationMode(TokenKeyValidation.fullValidation)
Expand All @@ -129,7 +129,7 @@ internal enum Program {
print("Removing Supply Key...")

// Remove the supply key with unusable key, signing with the new supply key.
let _ = try await TokenUpdateTransaction()
_ = try await TokenUpdateTransaction()
.tokenId(tokenId)
.supplyKey(.single(unusableKey))
.keyVerificationMode(TokenKeyValidation.noValidation)
Expand Down
2 changes: 1 addition & 1 deletion Tests/HieroE2ETests/Account/AccountBalance.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ internal final class AccountBalance: XCTestCase {
// .getReceipt(testEnv.client)
// }

// let _ = try await AccountBalanceQuery().accountId(account.id).execute(testEnv.client)
// _ = try await AccountBalanceQuery().accountId(account.id).execute(testEnv.client)

// // XCTAssertEqual(balance.tokenBalances[tokenId], 10000)
// // XCTAssertEqual(balance.tokenDecimals[tokenId], 50)
Expand Down
2 changes: 1 addition & 1 deletion Tests/HieroE2ETests/Account/AccountUpdate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ internal final class AccountUpdate: XCTestCase {
let tokenId = try XCTUnwrap(tokenCreateReceipt.tokenId)

// Associate token with account
let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(tokenId, testEnv.operator.accountId, -10)
.tokenTransfer(tokenId, accountId, 10)
.execute(testEnv.client)
Expand Down
1 change: 0 additions & 1 deletion Tests/HieroE2ETests/EthereumTransaction.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
* ‍
*/

import Hiero
import XCTest

@testable import Hiero
Expand Down
12 changes: 6 additions & 6 deletions Tests/HieroE2ETests/Token/TokenCancelAirdrop.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ internal class TokenCancelAirdrop: XCTestCase {
.getRecord(testEnv.client)

// Associate the receiver account with the token
let _ = try await TokenAssociateTransaction()
_ = try await TokenAssociateTransaction()
.accountId(receiverAccount.id)
.tokenIds([token.id])
.freezeWith(testEnv.client)
Expand All @@ -106,14 +106,14 @@ internal class TokenCancelAirdrop: XCTestCase {
.getReceipt(testEnv.client)

// Freeze the token
let _ = try await TokenFreezeTransaction()
_ = try await TokenFreezeTransaction()
.tokenId(token.id)
.accountId(receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

// Cancel the airdrop
let _ = try await TokenCancelAirdropTransaction()
_ = try await TokenCancelAirdropTransaction()
.addPendingAirdropId(record.pendingAirdropRecords[0].pendingAirdropId)
.execute(testEnv.client)
.getRecord(testEnv.client)
Expand All @@ -137,13 +137,13 @@ internal class TokenCancelAirdrop: XCTestCase {
.getRecord(testEnv.client)

// Pause the token
let _ = try await TokenPauseTransaction()
_ = try await TokenPauseTransaction()
.tokenId(token.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

// Cancel the airdrop
let _ = try await TokenCancelAirdropTransaction()
_ = try await TokenCancelAirdropTransaction()
.addPendingAirdropId(record.pendingAirdropRecords[0].pendingAirdropId)
.execute(testEnv.client)
.getRecord(testEnv.client)
Expand Down Expand Up @@ -173,7 +173,7 @@ internal class TokenCancelAirdrop: XCTestCase {
.getReceipt(testEnv.client)

// Cancel the airdrop
let _ = try await TokenCancelAirdropTransaction()
_ = try await TokenCancelAirdropTransaction()
.addPendingAirdropId(record.pendingAirdropRecords[0].pendingAirdropId)
.execute(testEnv.client)
.getRecord(testEnv.client)
Expand Down
2 changes: 1 addition & 1 deletion Tests/HieroE2ETests/Token/TokenPause.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ internal class TokenPause: XCTestCase {

let tokenId = try XCTUnwrap(receipt.tokenId)

let _ = try await TokenPauseTransaction().tokenId(tokenId).sign(owner.key).execute(testEnv.client)
_ = try await TokenPauseTransaction().tokenId(tokenId).sign(owner.key).execute(testEnv.client)
.getReceipt(testEnv.client)
}

Expand Down
56 changes: 28 additions & 28 deletions Tests/HieroE2ETests/Token/TokenReject.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft1.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft1.id, receiverAccount.id, 10)
.tokenTransfer(ft2.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft2.id, receiverAccount.id, 10)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.tokenIds([ft1.id, ft2.id])
.freezeWith(testEnv.client)
Expand Down Expand Up @@ -74,7 +74,7 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TokenMintTransaction()
_ = try await TokenMintTransaction()
.tokenId(nft1.id)
.metadata(Array(repeating: Data([9, 1, 6]), count: 5))
.execute(testEnv.client)
Expand All @@ -88,15 +88,15 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(nftMintReceipt2.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft1.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft1.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.nftIds([nft1.id.nft(nftSerials[1]), nft2.id.nft(nftSerials[1])])
.freezeWith(testEnv.client)
Expand Down Expand Up @@ -132,7 +132,7 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TokenMintTransaction()
_ = try await TokenMintTransaction()
.tokenId(nft1.id)
.metadata(Array(repeating: Data([9, 1, 6]), count: 5))
.execute(testEnv.client)
Expand All @@ -146,23 +146,23 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(nftMintReceipt2.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft1.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft1.id, receiverAccount.id, 10)
.tokenTransfer(ft2.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft2.id, receiverAccount.id, 10)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft1.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft1.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.tokenIds([ft1.id, ft2.id])
.nftIds([nft1.id.nft(nftSerials[1]), nft2.id.nft(nftSerials[1])])
Expand Down Expand Up @@ -217,7 +217,7 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TokenMintTransaction()
_ = try await TokenMintTransaction()
.tokenId(nft1.id)
.metadata(Array(repeating: Data([9, 1, 6]), count: 5))
.execute(testEnv.client)
Expand All @@ -231,23 +231,23 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(nftMintReceipt2.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft1.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft1.id, receiverAccount.id, 10)
.tokenTransfer(ft2.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft2.id, receiverAccount.id, 10)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft1.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft1.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft2.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.tokenIds([ft1.id, ft2.id])
.nftIds([nft1.id.nft(nftSerials[1]), nft2.id.nft(nftSerials[1])])
Expand Down Expand Up @@ -300,13 +300,13 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft.id, receiverAccount.id, 10)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenPauseTransaction()
_ = try await TokenPauseTransaction()
.tokenId(ft.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)
Expand Down Expand Up @@ -336,13 +336,13 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(mintReceipt.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenPauseTransaction()
_ = try await TokenPauseTransaction()
.tokenId(nft.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)
Expand Down Expand Up @@ -386,20 +386,20 @@ internal class TokenReject: XCTestCase {

let spenderAccountId = try XCTUnwrap(spenderCreateReceipt.accountId)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft.id, receiverAccount.id, 10)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await AccountAllowanceApproveTransaction()
_ = try await AccountAllowanceApproveTransaction()
.approveTokenAllowance(ft.id, receiverAccount.id, spenderAccountId, 10)
.freezeWith(testEnv.client)
.sign(receiverAccountKey)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.approvedTokenTransfer(ft.id, receiverAccount.id, -5)
.tokenTransfer(ft.id, spenderAccountId, 5)
.transactionId(TransactionId.generateFrom(spenderAccountId))
Expand All @@ -408,7 +408,7 @@ internal class TokenReject: XCTestCase {
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.addTokenId(ft.id)
.freezeWith(testEnv.client)
Expand Down Expand Up @@ -444,31 +444,31 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(mintReceipt.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[2]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[3]), testEnv.operator.accountId, receiverAccount.id)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await AccountAllowanceApproveTransaction()
_ = try await AccountAllowanceApproveTransaction()
.approveTokenNftAllowance(nft.id.nft(nftSerials[0]), receiverAccount.id, spenderAccountId)
.approveTokenNftAllowance(nft.id.nft(nftSerials[1]), receiverAccount.id, spenderAccountId)
.freezeWith(testEnv.client)
.sign(receiverAccountKey)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.approvedNftTransfer(nft.id.nft(nftSerials[0]), receiverAccount.id, spenderAccountId)
.transactionId(TransactionId.generateFrom(spenderAccountId))
.freezeWith(testEnv.client)
.sign(spenderAccountKey)
.execute(testEnv.client)
.getReceipt(testEnv.client)

let _ = try await TokenRejectTransaction()
_ = try await TokenRejectTransaction()
.owner(receiverAccount.id)
.nftIds([nft.id.nft(nftSerials[1]), nft.id.nft(nftSerials[2])])
.freezeWith(testEnv.client)
Expand Down Expand Up @@ -515,7 +515,7 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(mintReceipt.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.nftTransfer(nft.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[1]), testEnv.operator.accountId, receiverAccount.id)
.nftTransfer(nft.id.nft(nftSerials[2]), testEnv.operator.accountId, receiverAccount.id)
Expand Down Expand Up @@ -616,7 +616,7 @@ internal class TokenReject: XCTestCase {
let receiverAccountKey = PrivateKey.generateEd25519()
let receiverAccount = try await Account.create(testEnv, Key.single(receiverAccountKey.publicKey), 100)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft.id, receiverAccount.id, 10)
.execute(testEnv.client)
Expand Down Expand Up @@ -678,7 +678,7 @@ internal class TokenReject: XCTestCase {

let nftSerials = try XCTUnwrap(mintReceipt.serials)

let _ = try await TransferTransaction()
_ = try await TransferTransaction()
.tokenTransfer(ft.id, testEnv.operator.accountId, -10)
.tokenTransfer(ft.id, receiverAccount.id, 10)
.nftTransfer(nft.id.nft(nftSerials[0]), testEnv.operator.accountId, receiverAccount.id)
Expand Down
Loading

0 comments on commit 114dd7c

Please sign in to comment.