Added KeyVersion and Network

anquii · Feb 4, 2023 · cfded23 · cfded23
1 parent 02b3cc4
commit cfded23
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/...s/BIP32Tests/Helpers/BitcoinVersion.swift → Sources/BIP32/KeyVersion.swift b/...s/BIP32Tests/Helpers/BitcoinVersion.swift → Sources/BIP32/KeyVersion.swift
@@ -1,10 +1,7 @@
-@testable import BIP32
+@propertyWrapper public struct KeyVersion {
+    public let wrappedValue: UInt32
 
-@propertyWrapper
-struct BitcoinVersion {
-    let wrappedValue: UInt32
-
-    init(network: Network, keyAccessControl: KeyAccessControl) {
+    public init(network: Network, keyAccessControl: KeyAccessControl) {
         switch (network, keyAccessControl) {
         case (.mainnet, .`private`):
             wrappedValue = 0x0488ADE4

diff --git a/Tests/BIP32Tests/Helpers/Network.swift → Sources/BIP32/Network.swift b/Tests/BIP32Tests/Helpers/Network.swift → Sources/BIP32/Network.swift
@@ -1,4 +1,4 @@
-enum Network {
+public enum Network {
     case mainnet
     case testnet
 }
diff --git a/Tests/BIP32Tests/KeySerializerTests.swift b/Tests/BIP32Tests/KeySerializerTests.swift
@@ -10,7 +10,7 @@ final class KeySerializerTests: XCTestCase {
     func testGivenExtendedKey_AndAttributes_WhenSerialize_ThenNoErrorThrown() throws {
         let seed = Data(hex: "000102030405060708090a0b0c0d0e0f")
         let extendedKey = try PrivateMasterKeyDerivator().privateKey(seed: seed)
-        let keyVersion = BitcoinVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
+        let keyVersion = KeyVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
         let keyAttributes = MasterKeyAttributes(accessControl: .`private`, version: keyVersion)
 
         XCTAssertNoThrow(

diff --git a/Tests/BIP32Tests/PrivateChildKeyDerivatorTests.swift b/Tests/BIP32Tests/PrivateChildKeyDerivatorTests.swift
@@ -6,7 +6,7 @@ final class PrivateChildKeyDerivatorTests: XCTestCase {
     private let privateMasterKeyDerivator = PrivateMasterKeyDerivator()
     private let publicMasterKeyDerivator = PublicMasterKeyDerivator()
     private let publicChildKeyDerivator = PublicChildKeyDerivator()
-    private let keyVersion = BitcoinVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
+    private let keyVersion = KeyVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
     private let keyFingerprintDerivator = KeyFingerprintDerivator()
     private let keyIndexHardener = KeyIndexHardener()
     private let keySerializer = KeySerializer()

diff --git a/Tests/BIP32Tests/PrivateMasterKeyDerivatorTests.swift b/Tests/BIP32Tests/PrivateMasterKeyDerivatorTests.swift
@@ -3,7 +3,7 @@ import XCTest
 import BIP32
 
 final class PrivateMasterKeyDerivatorTests: XCTestCase {
-    private let keyVersion = BitcoinVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
+    private let keyVersion = KeyVersion(network: .mainnet, keyAccessControl: .`private`).wrappedValue
     private var keyAttributes: MasterKeyAttributes!
     private let keySerializer = KeySerializer()
     private let serializedKeyCoder = SerializedKeyCoder()

diff --git a/Tests/BIP32Tests/PublicChildKeyDerivatorTests.swift b/Tests/BIP32Tests/PublicChildKeyDerivatorTests.swift
@@ -6,7 +6,7 @@ final class PublicChildKeyDerivatorTests: XCTestCase {
     private let privateMasterKeyDerivator = PrivateMasterKeyDerivator()
     private let publicMasterKeyDerivator = PublicMasterKeyDerivator()
     private let privateChildKeyDerivator = PrivateChildKeyDerivator()
-    private let keyVersion = BitcoinVersion(network: .mainnet, keyAccessControl: .`public`).wrappedValue
+    private let keyVersion = KeyVersion(network: .mainnet, keyAccessControl: .`public`).wrappedValue
     private let keyFingerprintDerivator = KeyFingerprintDerivator()
     private let keyIndexHardener = KeyIndexHardener()
     private let keySerializer = KeySerializer()

diff --git a/Tests/BIP32Tests/PublicMasterKeyDerivatorTests.swift b/Tests/BIP32Tests/PublicMasterKeyDerivatorTests.swift
@@ -4,7 +4,7 @@ import XCTest
 
 final class PublicMasterKeyDerivatorTests: XCTestCase {
     private let privateKeyDerivator = PrivateMasterKeyDerivator()
-    private let keyVersion = BitcoinVersion(network: .mainnet, keyAccessControl: .`public`).wrappedValue
+    private let keyVersion = KeyVersion(network: .mainnet, keyAccessControl: .`public`).wrappedValue
     private var keyAttributes: MasterKeyAttributes!
     private let keySerializer = KeySerializer()
     private let serializedKeyCoder = SerializedKeyCoder()