Merge pull request #84 from gfusee/feature/reexport_spacekit_in_spacekittesting

gfusee · web-flow · commit 0dbe0632e671 · 2025-01-30T15:53:34.000+01:00
Reexport SpaceKit and BigInt in SpaceKitTesting
diff --git a/Package.swift b/Package.swift
@@ -71,49 +71,42 @@ if !isWasm {
         .testTarget(
             name: "ABITests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "AsyncCallsTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "BufferTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "BigUintTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "IntTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "ContractStorageTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "TestEngineTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
@@ -138,95 +131,79 @@ if !isWasm {
         .testTarget(
             name: "CodableMacroImplTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "CallbackMacroImplTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "AdderTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "ArrayTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "EventTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "FactorialTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "BlockchainTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "MessageTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "MultiArgsTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "ProxyTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting"
             ]
         ),
         .testTarget(
             name: "SendTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting",
-                "BigInt"
             ]
         ),
         .testTarget(
             name: "ErrorTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting",
-                "BigInt"
             ]
         ),
         .testTarget(
             name: "EsdtLocalRolesTests",
             dependencies: [
-                "SpaceKit",
                 "SpaceKitTesting",
-                "BigInt"
             ]
         )
     ])
diff --git a/Sources/SpaceKitTesting/lib.swift b/Sources/SpaceKitTesting/lib.swift
@@ -1,3 +1,11 @@
 #if canImport(XCTest)
 @_exported import XCTest
 #endif
+
+#if canImport(SpaceKit)
+@_exported import SpaceKit
+#endif
+
+#if canImport(BigInt)
+@_exported import BigInt
+#endif
diff --git a/Tests/AdderTests/AdderTests.swift b/Tests/AdderTests/AdderTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Init func initialize(initialValue: BigUint) {
diff --git a/Tests/ArrayTests/ArrayOfBuffersTests.swift b/Tests/ArrayTests/ArrayOfBuffersTests.swift
@@ -1,5 +1,4 @@
-@testable import SpaceKit
-import SpaceKitTesting
+@testable import SpaceKitTesting
 
 @Controller public struct ArrayOfBuffersTestsController {
     
diff --git a/Tests/ArrayTests/ArrayOfCustomEnumsTests.swift b/Tests/ArrayTests/ArrayOfCustomEnumsTests.swift
@@ -1,5 +1,4 @@
-@testable import SpaceKit
-import SpaceKitTesting
+@testable import SpaceKitTesting
 
 @Codable public enum CustomCodableEnum: Equatable {
     case first(Buffer, UInt64, UInt64, Buffer)
diff --git a/Tests/ArrayTests/ArrayOfCustomStructsTests.swift b/Tests/ArrayTests/ArrayOfCustomStructsTests.swift
@@ -1,5 +1,4 @@
-@testable import SpaceKit
-import SpaceKitTesting
+@testable import SpaceKitTesting
 
 @Codable public struct CustomCodableStruct: Equatable {
     let firstElement: Buffer
diff --git a/Tests/ArrayTests/ArrayOfIntegersTests.swift b/Tests/ArrayTests/ArrayOfIntegersTests.swift
@@ -1,5 +1,4 @@
-@testable import SpaceKit
-import SpaceKitTesting
+@testable import SpaceKitTesting
 
 @Controller public struct ArrayOfIntegersTestsController {
     
diff --git a/Tests/AsyncCallsTests/AsyncCallsTests.swift b/Tests/AsyncCallsTests/AsyncCallsTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct CalleeController {
diff --git a/Tests/BigUintTests/BigUintTests.swift b/Tests/BigUintTests/BigUintTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct BigUintTestsController {
diff --git a/Tests/BlockchainTests/AddQuantitySFTTests.swift b/Tests/BlockchainTests/AddQuantitySFTTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class AddQuantitySFTTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/BlockchainTests.swift b/Tests/BlockchainTests/BlockchainTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct BlockchainController {
diff --git a/Tests/BlockchainTests/BurnTokensTests.swift b/Tests/BlockchainTests/BurnTokensTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class BurnTokensTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/CreateNFTTests.swift b/Tests/BlockchainTests/CreateNFTTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class CreateNFTTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/MintFungibleTests.swift b/Tests/BlockchainTests/MintFungibleTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class MintFungibleTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/SetSpecialRolesTests.swift b/Tests/BlockchainTests/SetSpecialRolesTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class SetSpecialRolesTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/TokenAttributesTests.swift b/Tests/BlockchainTests/TokenAttributesTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class TokenAttributesTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/TokenIssuanceTests.swift b/Tests/BlockchainTests/TokenIssuanceTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class TokenIssuanceTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/TokenRoyaltiesTests.swift b/Tests/BlockchainTests/TokenRoyaltiesTests.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 final class TokenRoyaltiesTests: ContractTestCase {
diff --git a/Tests/BlockchainTests/utils/TokenTestsController.swift b/Tests/BlockchainTests/utils/TokenTestsController.swift
@@ -1,5 +1,3 @@
-import SpaceKit
-import BigInt
 import SpaceKitTesting
 
 @Codable public struct TestAttributes: Equatable {
diff --git a/Tests/BufferTests/BufferTests.swift b/Tests/BufferTests/BufferTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct BufferTestsController {
diff --git a/Tests/CallbackMacroImplTests/CallbackMacroImplTests.swift b/Tests/CallbackMacroImplTests/CallbackMacroImplTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Proxy enum DummyProxy {
diff --git a/Tests/CodableMacroImplTests/CodableMacroEnumImplTests.swift b/Tests/CodableMacroImplTests/CodableMacroEnumImplTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 // There was an issue with @Codable macro on enums that has only one case
diff --git a/Tests/CodableMacroImplTests/CodableMacroStructImplTests.swift b/Tests/CodableMacroImplTests/CodableMacroStructImplTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 // There was an issue with @Codable macro on structs or enums that has comments on its fields
diff --git a/Tests/ContractStorageTests/ContractStorageTests.swift b/Tests/ContractStorageTests/ContractStorageTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct CounterController {
diff --git a/Tests/ErrorTests/ContractErrorTests.swift b/Tests/ErrorTests/ContractErrorTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct ErrorController {
diff --git a/Tests/EventTests/EventTests.swift b/Tests/EventTests/EventTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Event(dataType: Buffer) public struct TestSingleIndexedFieldBufferDataEvent {
diff --git a/Tests/FactorialTests/FactorialTests.swift b/Tests/FactorialTests/FactorialTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct FactorialController {
diff --git a/Tests/IntTests/IntTests.swift b/Tests/IntTests/IntTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct IntTestsController {
diff --git a/Tests/IntTests/UInt64Tests.swift b/Tests/IntTests/UInt64Tests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct UInt64TestsController {
diff --git a/Tests/IntTests/UInt8Tests.swift b/Tests/IntTests/UInt8Tests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct UInt8TestsController {
diff --git a/Tests/MessageTests/MessageTests.swift b/Tests/MessageTests/MessageTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Init func initialize() {
diff --git a/Tests/MultiArgsTests/MultiArgsTests.swift b/Tests/MultiArgsTests/MultiArgsTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct MultiArgsController {
diff --git a/Tests/ProxyTests/ProxyTests.swift b/Tests/ProxyTests/ProxyTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Proxy enum CalleeProxy {
diff --git a/Tests/SendTests/ExecuteOnDestContextTests.swift b/Tests/SendTests/ExecuteOnDestContextTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Proxy enum ExecuteOnDestContextTestsProxy {
diff --git a/Tests/SendTests/TransferAndExecuteTests.swift b/Tests/SendTests/TransferAndExecuteTests.swift
@@ -1,6 +1,4 @@
-import SpaceKit
 import SpaceKitTesting
-import BigInt
 
 @Controller public struct EgldTransferController {
     
diff --git a/Tests/TestEngineTests/ErrorTests.swift b/Tests/TestEngineTests/ErrorTests.swift
@@ -1,4 +1,3 @@
-import SpaceKit
 import SpaceKitTesting
 
 @Controller public struct ErrorTestsController {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import SpaceKit`
`2`	`1`	`import SpaceKitTesting`
`3`	`2`
`4`	`3`	`@Init func initialize(initialValue: BigUint) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import SpaceKit`
`2`		`-import BigInt`
`3`	`1`	`import SpaceKitTesting`
`4`	`2`
`5`	`3`	`final class AddQuantitySFTTests: ContractTestCase {`