De-smurf naming

XYOracleNetwork · Nov 14, 2024 · 4774824 · 4774824
1 parent bca714b
commit 4774824
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/Sources/XyoClient/Witness/Basic/BasicWitness.swift b/Sources/XyoClient/Witness/Basic/BasicWitness.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-open class XyoBasicWitness: AbstractWitness {
+open class BasicWitness: AbstractWitness {
 
     public typealias TPayloadOut = Payload
 

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoCellularProviderPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoCellularProviderPayloadStruct.swift
@@ -1,7 +1,7 @@
 import CoreTelephony
 import Foundation
 
-struct XyoSystemInfoCellularProviderPayloadStruct: Encodable {
+struct SystemInfoCellularProviderPayloadStruct: Encodable {
     var allowVoip: Bool?
     var icc: String?
     var name: String?

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoDevicePayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoDevicePayloadStruct.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct XyoSystemInfoDevicePayloadStruct: Encodable {
+struct SystemInfoDevicePayloadStruct: Encodable {
     var model: String?
     var nodename: String?
     var release: String?

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkCellularPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkCellularPayloadStruct.swift
@@ -1,9 +1,9 @@
 import CoreTelephony
 import Foundation
 
-struct XyoSystemInfoNetworkCellularPayloadStruct: Encodable {
+struct SystemInfoNetworkCellularPayloadStruct: Encodable {
     var ip: String?
-    var provider = XyoSystemInfoCellularProviderPayloadStruct()
+    var provider = SystemInfoCellularProviderPayloadStruct()
     var radio: String?
     init(_ wifiInfo: WifiInformation?) {
         #if os(iOS)

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkPayloadStruct.swift
@@ -1,13 +1,13 @@
 import Foundation
 
-struct XyoSystemInfoNetworkPayloadStruct: Encodable {
-    var cellular: XyoSystemInfoNetworkCellularPayloadStruct?
-    var wifi: XyoSystemInfoNetworkWifiPayloadStruct?
-    var wired: XyoSystemInfoNetworkWiredPayloadStruct?
+struct SystemInfoNetworkPayloadStruct: Encodable {
+    var cellular: SystemInfoNetworkCellularPayloadStruct?
+    var wifi: SystemInfoNetworkWifiPayloadStruct?
+    var wired: SystemInfoNetworkWiredPayloadStruct?
 
     init(_ wifiInfo: WifiInformation) {
-        cellular = wifiInfo.isCellular() ? XyoSystemInfoNetworkCellularPayloadStruct(wifiInfo) : nil
-        wifi = wifiInfo.isWifi() ? XyoSystemInfoNetworkWifiPayloadStruct(wifiInfo) : nil
-        wired = wifiInfo.isWired() ? XyoSystemInfoNetworkWiredPayloadStruct(wifiInfo) : nil
+        cellular = wifiInfo.isCellular() ? SystemInfoNetworkCellularPayloadStruct(wifiInfo) : nil
+        wifi = wifiInfo.isWifi() ? SystemInfoNetworkWifiPayloadStruct(wifiInfo) : nil
+        wired = wifiInfo.isWired() ? SystemInfoNetworkWiredPayloadStruct(wifiInfo) : nil
     }
 }
diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkWifiPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkWifiPayloadStruct.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct XyoSystemInfoNetworkWifiPayloadStruct: Encodable {
+struct SystemInfoNetworkWifiPayloadStruct: Encodable {
     var ip: String?
     var mac: String?
     var rssi: Int?

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkWiredPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoNetworkWiredPayloadStruct.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct XyoSystemInfoNetworkWiredPayloadStruct: Encodable {
+struct SystemInfoNetworkWiredPayloadStruct: Encodable {
     var ip: String?
     init(_ wifiInfo: WifiInformation?) {
         ip = wifiInfo?.pathMonitor?.ip

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoOsPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoOsPayloadStruct.swift
@@ -1,8 +1,8 @@
 import Foundation
 
-struct XyoSystemInfoOsPayloadStruct: Encodable {
+struct SystemInfoOsPayloadStruct: Encodable {
     var name: String
-    var version = XyoSystemInfoOsVersionPayloadStruct()
+    var version = SystemInfoOsVersionPayloadStruct()
     init() {
         name = osName()
     }

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoOsVersionPayloadStruct.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoOsVersionPayloadStruct.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct XyoSystemInfoOsVersionPayloadStruct: Encodable {
+struct SystemInfoOsVersionPayloadStruct: Encodable {
     var major: Int
     var minor: Int
     var patch: Int

diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoPayload.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoPayload.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-open class XyoSystemInfoPayload: Payload {
+open class SystemInfoPayload: Payload {
 
     var wifiInfo: WifiInformation
 
@@ -18,9 +18,9 @@ open class XyoSystemInfoPayload: Payload {
     }
     override open func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(XyoSystemInfoDevicePayloadStruct(), forKey: .device)
-        try container.encode(XyoSystemInfoNetworkPayloadStruct(wifiInfo), forKey: .network)
-        try container.encode(XyoSystemInfoOsPayloadStruct(), forKey: .os)
+        try container.encode(SystemInfoDevicePayloadStruct(), forKey: .device)
+        try container.encode(SystemInfoNetworkPayloadStruct(wifiInfo), forKey: .network)
+        try container.encode(SystemInfoOsPayloadStruct(), forKey: .os)
         try container.encode(self.schema, forKey: .schema)
     }
 }
diff --git a/Sources/XyoClient/Witness/SystemInfo/SystemInfoWitness.swift b/Sources/XyoClient/Witness/SystemInfo/SystemInfoWitness.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-open class XyoSystemInfoWitness: AbstractWitness {
+open class SystemInfoWitness: AbstractWitness {
 
     var allowPathMonitor: Bool
 
@@ -9,7 +9,7 @@ open class XyoSystemInfoWitness: AbstractWitness {
     }
 
     public override func observe() -> [Payload] {
-        let payload = XyoSystemInfoPayload(WifiInformation(allowPathMonitor))
+        let payload = SystemInfoPayload(WifiInformation(allowPathMonitor))
         return [payload]
     }
 }
diff --git a/Tests/XyoClientTests/Panel.swift b/Tests/XyoClientTests/Panel.swift
@@ -43,7 +43,7 @@ final class PanelTests: XCTestCase {
             archive: archive,
             apiDomain: apiDomain,
             witnesses: [
-                XyoBasicWitness(observer: {
+                BasicWitness(observer: {
                     return Payload("network.xyo.basic")
                 })
             ]
@@ -64,10 +64,10 @@ final class PanelTests: XCTestCase {
             archive: archive,
             apiDomain: apiDomain,
             witnesses: [
-                XyoBasicWitness(observer: {
+                BasicWitness(observer: {
                     return Payload("network.xyo.basic")
                 }),
-                XyoSystemInfoWitness(),
+                SystemInfoWitness(),
             ]
         )
         do {