refactor: formatting

rwalworth · rwalworth · commit 8f0ef5c1264f · 2025-12-05T17:09:04.000-05:00
Signed-off-by: Rob Walworth &lt;robert.walworth@swirldslabs.com&gt;
diff --git a/Tests/HieroIntegrationTests/Account/AccountAllowanceApproveTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/Account/AccountAllowanceApproveTransactionIntegrationTests.swift
@@ -7,7 +7,8 @@ import XCTest
 internal final class AccountAllowanceApproveTransactionIntegrationTests: HieroIntegrationTestCase {
     internal func test_Spend() async throws {
         // Given
-        let (aliceAccountId, aliceKey) = try await createTestAccount(initialBalance: TestConstants.testMediumHbarBalance)
+        let (aliceAccountId, aliceKey) = try await createTestAccount(
+            initialBalance: TestConstants.testMediumHbarBalance)
         let (bobAccountId, bobKey) = try await createTestAccount(initialBalance: TestConstants.testMediumHbarBalance)
 
         // When
diff --git a/Tests/HieroIntegrationTests/Account/AccountCreateTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/Account/AccountCreateTransactionIntegrationTests.swift
@@ -84,7 +84,8 @@ internal final class AccountCreateTransactionIntegrationTests: HieroIntegrationT
 
         // Then
         let info = try await AccountInfoQuery(accountId: accountId).execute(testEnv.client)
-        assertAccountInfoWithEvmAddress(info, accountId: accountId, key: .single(adminKey.publicKey), evmAddress: evmAddress)
+        assertAccountInfoWithEvmAddress(
+            info, accountId: accountId, key: .single(adminKey.publicKey), evmAddress: evmAddress)
     }
 
     internal func test_AliasFromAdminKeyWithReceiverSigRequired() async throws {
@@ -104,7 +105,8 @@ internal final class AccountCreateTransactionIntegrationTests: HieroIntegrationT
 
         // Then
         let info = try await AccountInfoQuery(accountId: accountId).execute(testEnv.client)
-        assertAccountInfoWithEvmAddress(info, accountId: accountId, key: .single(adminKey.publicKey), evmAddress: evmAddress)
+        assertAccountInfoWithEvmAddress(
+            info, accountId: accountId, key: .single(adminKey.publicKey), evmAddress: evmAddress)
     }
 
     internal func test_AliasFromAdminKeyWithReceiverSigRequiredMissingSignatureFails()
diff --git a/Tests/HieroIntegrationTests/Account/AccountDeleteTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/Account/AccountDeleteTransactionIntegrationTests.swift
@@ -7,7 +7,8 @@ import XCTest
 internal final class AccountDeleteTransactionIntegrationTests: HieroIntegrationTestCase {
     internal func test_CreateThenDelete() async throws {
         // Given
-        let (accountId, key) = try await createSimpleUnmanagedAccount(initialBalance: TestConstants.testSmallHbarBalance)
+        let (accountId, key) = try await createSimpleUnmanagedAccount(
+            initialBalance: TestConstants.testSmallHbarBalance)
 
         // When
         _ = try await AccountDeleteTransaction()
diff --git a/Tests/HieroIntegrationTests/Account/AccountInfoQueryIntegrationTests.swift b/Tests/HieroIntegrationTests/Account/AccountInfoQueryIntegrationTests.swift
@@ -11,7 +11,8 @@ internal final class AccountInfoQueryIntegrationTests: HieroIntegrationTestCase
             .execute(testEnv.client)
 
         // Then
-        assertAccountInfo(info, accountId: testEnv.operator.accountId, key: .single(testEnv.operator.privateKey.publicKey))
+        assertAccountInfo(
+            info, accountId: testEnv.operator.accountId, key: .single(testEnv.operator.privateKey.publicKey))
         XCTAssertGreaterThan(info.balance, 0)
         XCTAssertEqual(info.proxyReceived, 0)
     }
diff --git a/Tests/HieroIntegrationTests/File/FileAppendTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileAppendTransactionIntegrationTests.swift
@@ -6,7 +6,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileAppendTransactionIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileAppend]"
 
     // MARK: - Tests
diff --git a/Tests/HieroIntegrationTests/File/FileContentsQueryIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileContentsQueryIntegrationTests.swift
@@ -5,7 +5,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileContentsQueryIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileContents]"
 
     // MARK: - Tests
@@ -60,7 +60,8 @@ internal final class FileContentsQueryIntegrationTests: HieroIntegrationTestCase
         let cost = try await query.getCost(testEnv.client)
 
         // When
-        let contents = try await query
+        let contents =
+            try await query
             .paymentAmount(cost)
             .execute(testEnv.client)
 
diff --git a/Tests/HieroIntegrationTests/File/FileCreateTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileCreateTransactionIntegrationTests.swift
@@ -5,7 +5,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileCreateTransactionIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileCreate]"
 
     // MARK: - Tests
diff --git a/Tests/HieroIntegrationTests/File/FileDeleteTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileDeleteTransactionIntegrationTests.swift
@@ -5,7 +5,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileDeleteTransactionIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileDelete]"
 
     // MARK: - Tests
diff --git a/Tests/HieroIntegrationTests/File/FileInfoQueryIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileInfoQueryIntegrationTests.swift
@@ -5,7 +5,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileInfoQueryIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileInfo]"
 
     // MARK: - Tests
@@ -51,7 +51,8 @@ internal final class FileInfoQueryIntegrationTests: HieroIntegrationTestCase {
         let cost = try await query.getCost(testEnv.client)
 
         // When / Then
-        _ = try await query
+        _ =
+            try await query
             .paymentAmount(cost)
             .execute(testEnv.client)
     }
diff --git a/Tests/HieroIntegrationTests/File/FileUpdateTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/File/FileUpdateTransactionIntegrationTests.swift
@@ -5,7 +5,7 @@ import HieroTestSupport
 import XCTest
 
 internal final class FileUpdateTransactionIntegrationTests: HieroIntegrationTestCase {
-    
+
     private let testContent = "[swift::e2e::fileUpdate]"
 
     // MARK: - Tests
diff --git a/Tests/HieroIntegrationTests/Token/TokenAirdropTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/Token/TokenAirdropTransactionIntegrationTests.swift
@@ -63,7 +63,9 @@ internal class TokenAirdropTransactionIntegrationTests: HieroIntegrationTestCase
         let operatorBalance = try await AccountBalanceQuery()
             .accountId(testEnv.operator.accountId)
             .execute(testEnv.client)
-        XCTAssertEqual(operatorBalance.tokenBalances[fungibleTokenId]!, TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
+        XCTAssertEqual(
+            operatorBalance.tokenBalances[fungibleTokenId]!,
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
         XCTAssertEqual(operatorBalance.tokenBalances[nftTokenId]!, UInt64(TestConstants.testMintedNfts) - 2)
     }
 
@@ -194,7 +196,9 @@ internal class TokenAirdropTransactionIntegrationTests: HieroIntegrationTestCase
             .accountId(testEnv.operator.accountId)
             .execute(testEnv.client)
 
-        XCTAssertEqual(operatorBalance.tokenBalances[fungibleTokenId]!, TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
+        XCTAssertEqual(
+            operatorBalance.tokenBalances[fungibleTokenId]!,
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
         XCTAssertEqual(operatorBalance.tokenBalances[nftTokenId]!, UInt64(TestConstants.testMintedNfts) - 2)
     }
 
@@ -288,8 +292,11 @@ internal class TokenAirdropTransactionIntegrationTests: HieroIntegrationTestCase
             .execute(testEnv.client)
 
         XCTAssertEqual(
-            operatorBalance.tokenBalances[customFeeTokenId]!, TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount) + 1)
-        XCTAssertEqual(operatorBalance.tokenBalances[tokenId]!, TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
+            operatorBalance.tokenBalances[customFeeTokenId]!,
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount) + 1)
+        XCTAssertEqual(
+            operatorBalance.tokenBalances[tokenId]!,
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
     }
 
     internal func test_AirdropTokensWithReceiverSigRequiredFungible() async throws {
diff --git a/Tests/HieroIntegrationTests/Token/TokenClaimAirdropTransactionIntegrationTests.swift b/Tests/HieroIntegrationTests/Token/TokenClaimAirdropTransactionIntegrationTests.swift
@@ -93,7 +93,9 @@ internal class TokenClaimAirdropTransactionIntegrationTests: HieroIntegrationTes
             .accountId(testEnv.operator.accountId)
             .execute(testEnv.client)
 
-        XCTAssertEqual(operatorBalance.tokenBalances[fungibleTokenId]!, TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
+        XCTAssertEqual(
+            operatorBalance.tokenBalances[fungibleTokenId]!,
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
         XCTAssertEqual(operatorBalance.tokenBalances[nftTokenId]!, UInt64(TestConstants.testMintedNfts) - 2)
     }
 
@@ -204,7 +206,8 @@ internal class TokenClaimAirdropTransactionIntegrationTests: HieroIntegrationTes
             .execute(testEnv.client)
 
         XCTAssertEqual(
-            operatorBalance.tokenBalances[fungibleTokenId], TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount) * 2)
+            operatorBalance.tokenBalances[fungibleTokenId],
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount) * 2)
         XCTAssertEqual(operatorBalance.tokenBalances[nftTokenId], UInt64(TestConstants.testMintedNfts) - 4)
     }
 
@@ -307,7 +310,9 @@ internal class TokenClaimAirdropTransactionIntegrationTests: HieroIntegrationTes
             .accountId(testEnv.operator.accountId)
             .execute(testEnv.client)
 
-        XCTAssertEqual(operatorBalance.tokenBalances[fungibleTokenId], TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
+        XCTAssertEqual(
+            operatorBalance.tokenBalances[fungibleTokenId],
+            TestConstants.testFungibleInitialBalance - UInt64(TestConstants.testAmount))
         XCTAssertEqual(operatorBalance.tokenBalances[nftTokenId], UInt64(TestConstants.testMintedNfts) - 2)
     }
 
diff --git a/Tests/HieroTestSupport/Assertions/HieroAssertions.swift b/Tests/HieroTestSupport/Assertions/HieroAssertions.swift
@@ -94,7 +94,8 @@ public func assertReceiptStatus<T>(
         line: line
     ) { error in
         guard case .receiptStatus(let status, transactionId: _) = error.kind else {
-            let failMessage = "Expected receiptStatus error, got \(error.kind)"
+            let failMessage =
+                "Expected receiptStatus error, got \(error.kind)"
                 + (msg.isEmpty ? "" : " - \(msg)")
             XCTFail(failMessage, file: file, line: line)
             return
@@ -138,7 +139,8 @@ public func assertPrecheckStatus<T>(
         line: line
     ) { error in
         guard case .transactionPreCheckStatus(let status, transactionId: _) = error.kind else {
-            let failMessage = "Expected transactionPreCheckStatus error, got \(error.kind)"
+            let failMessage =
+                "Expected transactionPreCheckStatus error, got \(error.kind)"
                 + (msg.isEmpty ? "" : " - \(msg)")
             XCTFail(failMessage, file: file, line: line)
             return
diff --git a/Tests/HieroTestSupport/Base/HieroUnitTestCase.swift b/Tests/HieroTestSupport/Base/HieroUnitTestCase.swift
@@ -3,16 +3,14 @@
 import Foundation
 import Hiero
 import HieroProtobufs
+/// Re-export HieroProtobufs for protobuf types in tests
+@_exported import HieroProtobufs
 import SnapshotTesting
-import XCTest
-
-// MARK: - Re-exports for convenience
-
 /// Re-export SnapshotTesting so tests only need to import HieroTestSupport
 @_exported import SnapshotTesting
+import XCTest
 
-/// Re-export HieroProtobufs for protobuf types in tests
-@_exported import HieroProtobufs
+// MARK: - Re-exports for convenience
 
 /// Base class for unit tests (no network required).
 ///
diff --git a/Tests/HieroTestSupport/Helpers/HieroIntegrationTestCase+Contract.swift b/Tests/HieroTestSupport/Helpers/HieroIntegrationTestCase+Contract.swift
@@ -235,7 +235,8 @@ extension HieroIntegrationTestCase {
             String(describing: info.accountId), String(describing: info.contractId),
             "Account ID should match contract ID", file: file, line: line
         )
-        XCTAssertEqual(info.adminKey, .contractId(contractId), "Admin key should be contract ID", file: file, line: line)
+        XCTAssertEqual(
+            info.adminKey, .contractId(contractId), "Admin key should be contract ID", file: file, line: line)
         XCTAssertEqual(info.storage, storage, "Storage mismatch", file: file, line: line)
     }
 }
diff --git a/Tests/HieroUnitTests/AssessedCustomFeeUnitTests.swift b/Tests/HieroUnitTests/AssessedCustomFeeUnitTests.swift
@@ -46,7 +46,8 @@ internal final class AssessedCustomFeeUnitTests: HieroUnitTestCase {
     }
 
     internal func test_ToProtobuf() {
-        SnapshotTesting.assertSnapshot(of: try AssessedCustomFee.fromProtobuf(Self.feeProto).toProtobuf(), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try AssessedCustomFee.fromProtobuf(Self.feeProto).toProtobuf(), as: .description)
     }
 
     internal func test_ToBytes() {
diff --git a/Tests/HieroUnitTests/FileContentsResponseUnitTests.swift b/Tests/HieroUnitTests/FileContentsResponseUnitTests.swift
@@ -23,6 +23,7 @@ internal final class FileContentsResponseUnitTests: HieroUnitTestCase {
     }
 
     internal func test_ToProtobuf() throws {
-        SnapshotTesting.assertSnapshot(of: FileContentsResponse.fromProtobuf(Self.response).toProtobuf(), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: FileContentsResponse.fromProtobuf(Self.response).toProtobuf(), as: .description)
     }
 }
diff --git a/Tests/HieroUnitTests/ProxyStakerUnitTests.swift b/Tests/HieroUnitTests/ProxyStakerUnitTests.swift
@@ -17,6 +17,7 @@ internal final class ProxyStakerUnitTests: HieroUnitTestCase {
     }
 
     internal func test_ToProtobuf() throws {
-        SnapshotTesting.assertSnapshot(of: try ProxyStaker.fromProtobuf(Self.proxyStaker).toProtobuf(), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try ProxyStaker.fromProtobuf(Self.proxyStaker).toProtobuf(), as: .description)
     }
 }
diff --git a/Tests/HieroUnitTests/SignatureUnitTests.swift b/Tests/HieroUnitTests/SignatureUnitTests.swift
@@ -17,7 +17,9 @@ internal final class SignatureUnitTests: HieroUnitTestCase {
 
         let bodyBytes = try new.maxTransactionFee(10).transactionValidDuration(Duration.seconds(119))
             .transactionMemo("Frosted flakes").hbarTransfer(AccountId(2), 2).hbarTransfer(AccountId(101), -2)
-            .transactionId(TestConstants.transactionId).nodeAccountIds(TestConstants.nodeAccountIds).freeze().sign(Self.firstPrivateKey)
+            .transactionId(TestConstants.transactionId).nodeAccountIds(TestConstants.nodeAccountIds).freeze().sign(
+                Self.firstPrivateKey
+            )
             .sign(Self.secondPrivateKey)
             .toBytes()
 
diff --git a/Tests/HieroUnitTests/StakingInfoUnitTests.swift b/Tests/HieroUnitTests/StakingInfoUnitTests.swift
@@ -28,19 +28,22 @@ internal final class StakingInfoUnitTests: HieroUnitTestCase {
     }
 
     internal func test_ToProtobufAccount() throws {
-        SnapshotTesting.assertSnapshot(of: try StakingInfo.fromProtobuf(Self.stakingInfoAccount).toProtobuf(), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try StakingInfo.fromProtobuf(Self.stakingInfoAccount).toProtobuf(), as: .description)
     }
 
     internal func test_FromProtobufNode() throws {
         SnapshotTesting.assertSnapshot(of: try StakingInfo.fromProtobuf(Self.stakingInfoNode), as: .description)
     }
 
     internal func test_ToProtobufNode() throws {
-        SnapshotTesting.assertSnapshot(of: try StakingInfo.fromProtobuf(Self.stakingInfoNode).toProtobuf(), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try StakingInfo.fromProtobuf(Self.stakingInfoNode).toProtobuf(), as: .description)
     }
 
     internal func test_FromBytesAccount() throws {
-        SnapshotTesting.assertSnapshot(of: try StakingInfo.fromBytes(Self.stakingInfoAccount.serializedData()), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try StakingInfo.fromBytes(Self.stakingInfoAccount.serializedData()), as: .description)
     }
 
     internal func test_ToBytesAccount() throws {
@@ -50,7 +53,8 @@ internal final class StakingInfoUnitTests: HieroUnitTestCase {
     }
 
     internal func test_FromBytesNode() throws {
-        SnapshotTesting.assertSnapshot(of: try StakingInfo.fromBytes(Self.stakingInfoNode.serializedData()), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try StakingInfo.fromBytes(Self.stakingInfoNode.serializedData()), as: .description)
     }
 
     internal func test_ToBytesNode() throws {
diff --git a/Tests/HieroUnitTests/TokenAllowanceUnitTests.swift b/Tests/HieroUnitTests/TokenAllowanceUnitTests.swift
@@ -12,7 +12,8 @@ internal final class TokenAllowanceUnitTests: HieroUnitTestCase {
 
     private static func makeAllowance() -> TokenAllowance {
         TokenAllowance(
-            tokenId: TestConstants.tokenId, ownerAccountId: TestConstants.accountId, spenderAccountId: testSpenderAccountId,
+            tokenId: TestConstants.tokenId, ownerAccountId: TestConstants.accountId,
+            spenderAccountId: testSpenderAccountId,
             amount: 4)
     }
 
diff --git a/Tests/HieroUnitTests/TopicMessageUnitTests.swift b/Tests/HieroUnitTests/TopicMessageUnitTests.swift
@@ -22,7 +22,8 @@ internal class TopicMessageUnitTests: HieroUnitTestCase {
         let topicMessageChunkArr: [TopicMessageChunk] = [topicMessageChunk, topicMessageChunk, topicMessageChunk]
 
         let topicMessage = TopicMessage(
-            consensusTimestamp: TestConstants.validStart, contents: Self.testContents, runningHash: Self.testRunningHash,
+            consensusTimestamp: TestConstants.validStart, contents: Self.testContents,
+            runningHash: Self.testRunningHash,
             runningHashVersion: 0, sequenceNumber: Self.testSequenceNumber, transaction: Self.testTxId,
             chunks: topicMessageChunkArr)
 
diff --git a/Tests/HieroUnitTests/TransactionChunkInfoUnitTests.swift b/Tests/HieroUnitTests/TransactionChunkInfoUnitTests.swift
@@ -8,7 +8,8 @@ import XCTest
 
 internal final class TransactionChunkInfoUnitTests: HieroUnitTestCase {
     internal func test_Initial() throws {
-        let info = ChunkInfo.initial(total: 2, transactionId: TestConstants.transactionId, nodeAccountId: TestConstants.accountId)
+        let info = ChunkInfo.initial(
+            total: 2, transactionId: TestConstants.transactionId, nodeAccountId: TestConstants.accountId)
 
         XCTAssertEqual(info.current, 0)
         XCTAssertEqual(info.total, 2)
@@ -19,7 +20,8 @@ internal final class TransactionChunkInfoUnitTests: HieroUnitTestCase {
 
     internal func test_Arguments() throws {
         let info = ChunkInfo(
-            current: 3, total: 4, initialTransactionId: TestConstants.transactionId, currentTransactionId: TestConstants.transactionId,
+            current: 3, total: 4, initialTransactionId: TestConstants.transactionId,
+            currentTransactionId: TestConstants.transactionId,
             nodeAccountId: TestConstants.nodeAccountIds[0])
 
         XCTAssertEqual(info.current, 3)
@@ -30,7 +32,8 @@ internal final class TransactionChunkInfoUnitTests: HieroUnitTestCase {
     }
 
     internal func test_Single() throws {
-        let info = ChunkInfo.single(transactionId: TestConstants.transactionId, nodeAccountId: TestConstants.nodeAccountIds[0])
+        let info = ChunkInfo.single(
+            transactionId: TestConstants.transactionId, nodeAccountId: TestConstants.nodeAccountIds[0])
 
         XCTAssertEqual(info.current, 0)
         XCTAssertEqual(info.total, 1)
diff --git a/Tests/HieroUnitTests/TransactionIdUnitTests.swift b/Tests/HieroUnitTests/TransactionIdUnitTests.swift
@@ -42,7 +42,8 @@ internal final class TransactionIdUnitTests: HieroUnitTestCase {
     }
 
     internal func test_Serialize() {
-        SnapshotTesting.assertSnapshot(of: try TransactionId.fromString("0.0.23847@1588539964.632521325"), as: .description)
+        SnapshotTesting.assertSnapshot(
+            of: try TransactionId.fromString("0.0.23847@1588539964.632521325"), as: .description)
     }
 
     internal func test_Serialize2() {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ internal final class AccountInfoQueryIntegrationTests: HieroIntegrationTestCase`
`11`	`11`	`.execute(testEnv.client)`
`12`	`12`
`13`	`13`	`// Then`
`14`		`- assertAccountInfo(info, accountId: testEnv.operator.accountId, key: .single(testEnv.operator.privateKey.publicKey))`
	`14`	`+ assertAccountInfo(`
	`15`	`+ info, accountId: testEnv.operator.accountId, key: .single(testEnv.operator.privateKey.publicKey))`
`15`	`16`	`XCTAssertGreaterThan(info.balance, 0)`
`16`	`17`	`XCTAssertEqual(info.proxyReceived, 0)`
`17`	`18`	`}`