@@ -22,6 +22,11 @@ import Hedera
2222import XCTest
2323
2424internal class TokenReject : XCTestCase {
25+
26+ private var skipTest : Bool {
27+ true
28+ }
29+
2530 internal func testBasicFtReject( ) async throws {
2631 let testEnv = try TestEnvironment . nonFree
2732
@@ -366,21 +371,17 @@ internal class TokenReject: XCTestCase {
366371 }
367372
368373 internal func testRemoveAllowance( ) async throws {
374+ if skipTest {
375+ throw XCTSkip ( " Temporarily disabled until nft issue is resolved on server side " )
376+ }
377+
369378 let testEnv = try TestEnvironment . nonFree
370379
371380 let ft = try await FungibleToken . create ( testEnv, decimals: 3 )
372381 let receiverAccountKey = PrivateKey . generateEd25519 ( )
373- let receiverAccount = try await Account . create ( testEnv, Key . single ( receiverAccountKey. publicKey) , 100 )
374-
382+ let receiverAccount = try await Account . create ( testEnv, Key . single ( receiverAccountKey. publicKey) , - 1 )
375383 let spenderAccountKey = PrivateKey . generateEd25519 ( )
376- let spenderCreateReceipt = try await AccountCreateTransaction ( )
377- . key ( . single( spenderAccountKey. publicKey) )
378- . initialBalance ( Hbar ( 1 ) )
379- . maxAutomaticTokenAssociations ( - 1 )
380- . execute ( testEnv. client)
381- . getReceipt ( testEnv. client)
382-
383- let spenderAccountId = try XCTUnwrap ( spenderCreateReceipt. accountId)
384+ let spenderAccount = try await Account . create ( testEnv, Key . single ( spenderAccountKey. publicKey) , - 1 )
384385
385386 let _ = try await TransferTransaction ( )
386387 . tokenTransfer ( ft. id, testEnv. operator. accountId, - 10 )
@@ -389,16 +390,16 @@ internal class TokenReject: XCTestCase {
389390 . getReceipt ( testEnv. client)
390391
391392 let _ = try await AccountAllowanceApproveTransaction ( )
392- . approveTokenAllowance ( ft. id, receiverAccount. id, spenderAccountId , 10 )
393+ . approveTokenAllowance ( ft. id, receiverAccount. id, spenderAccount . id , 10 )
393394 . freezeWith ( testEnv. client)
394395 . sign ( receiverAccountKey)
395396 . execute ( testEnv. client)
396397 . getReceipt ( testEnv. client)
397398
398399 let _ = try await TransferTransaction ( )
399400 . approvedTokenTransfer ( ft. id, receiverAccount. id, - 5 )
400- . tokenTransfer ( ft. id, spenderAccountId , 5 )
401- . transactionId ( TransactionId . generateFrom ( spenderAccountId ) )
401+ . tokenTransfer ( ft. id, spenderAccount . id , 5 )
402+ . transactionId ( TransactionId . generateFrom ( spenderAccount . id ) )
402403 . freezeWith ( testEnv. client)
403404 . sign ( spenderAccountKey)
404405 . execute ( testEnv. client)
@@ -415,8 +416,8 @@ internal class TokenReject: XCTestCase {
415416 await assertThrowsHErrorAsync (
416417 try await TransferTransaction ( )
417418 . approvedTokenTransfer ( ft. id, receiverAccount. id, - 5 )
418- . tokenTransfer ( ft. id, spenderAccountId , 5 )
419- . transactionId ( TransactionId . generateFrom ( spenderAccountId ) )
419+ . tokenTransfer ( ft. id, spenderAccount . id , 5 )
420+ . transactionId ( TransactionId . generateFrom ( spenderAccount . id ) )
420421 . freezeWith ( testEnv. client)
421422 . sign ( spenderAccountKey)
422423 . execute ( testEnv. client)
@@ -449,16 +450,16 @@ internal class TokenReject: XCTestCase {
449450 . getReceipt ( testEnv. client)
450451
451452 let _ = try await AccountAllowanceApproveTransaction ( )
452- . approveTokenNftAllowance ( nft. id. nft ( nftSerials [ 0 ] ) , receiverAccount. id, spenderAccountId )
453- . approveTokenNftAllowance ( nft. id. nft ( nftSerials [ 1 ] ) , receiverAccount. id, spenderAccountId )
453+ . approveTokenNftAllowance ( nft. id. nft ( nftSerials [ 0 ] ) , receiverAccount. id, spenderAccount . id )
454+ . approveTokenNftAllowance ( nft. id. nft ( nftSerials [ 1 ] ) , receiverAccount. id, spenderAccount . id )
454455 . freezeWith ( testEnv. client)
455456 . sign ( receiverAccountKey)
456457 . execute ( testEnv. client)
457458 . getReceipt ( testEnv. client)
458459
459460 let _ = try await TransferTransaction ( )
460- . approvedNftTransfer ( nft. id. nft ( nftSerials [ 0 ] ) , receiverAccount. id, spenderAccountId )
461- . transactionId ( TransactionId . generateFrom ( spenderAccountId ) )
461+ . approvedNftTransfer ( nft. id. nft ( nftSerials [ 0 ] ) , receiverAccount. id, spenderAccount . id )
462+ . transactionId ( TransactionId . generateFrom ( spenderAccount . id ) )
462463 . freezeWith ( testEnv. client)
463464 . sign ( spenderAccountKey)
464465 . execute ( testEnv. client)
@@ -474,9 +475,9 @@ internal class TokenReject: XCTestCase {
474475
475476 await assertThrowsHErrorAsync (
476477 try await TransferTransaction ( )
477- . approvedNftTransfer ( nft. id. nft ( nftSerials [ 1 ] ) , receiverAccount. id, spenderAccountId )
478- . approvedNftTransfer ( nft. id. nft ( nftSerials [ 2 ] ) , receiverAccount. id, spenderAccountId )
479- . transactionId ( TransactionId . generateFrom ( spenderAccountId ) )
478+ . approvedNftTransfer ( nft. id. nft ( nftSerials [ 1 ] ) , receiverAccount. id, spenderAccount . id )
479+ . approvedNftTransfer ( nft. id. nft ( nftSerials [ 2 ] ) , receiverAccount. id, spenderAccount . id )
480+ . transactionId ( TransactionId . generateFrom ( spenderAccount . id ) )
480481 . freezeWith ( testEnv. client)
481482 . sign ( spenderAccountKey)
482483 . execute ( testEnv. client)
0 commit comments