Skip to content

Commit c4c9ccf

Browse files
Remove various ivars and headers no longer needed in MTRDeviceController. (project-chip#36321)
The functionality that used them has been moved out.
1 parent edd9202 commit c4c9ccf

File tree

1 file changed

+2
-41
lines changed

1 file changed

+2
-41
lines changed

src/darwin/Framework/CHIP/MTRDeviceController.mm

+2-41
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,17 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
#import <Matter/MTRCommissionableBrowserResult.h>
1718
#import <Matter/MTRDefines.h>
1819
#import <Matter/MTRDeviceControllerParameters.h>
1920

2021
#import "MTRDeviceController_Internal.h"
2122

2223
#import "MTRAsyncWorkQueue.h"
23-
#import "MTRAttestationTrustStoreBridge.h"
2424
#import "MTRBaseDevice_Internal.h"
25-
#import "MTRCommissionableBrowser.h"
26-
#import "MTRCommissionableBrowserResult_Internal.h"
2725
#import "MTRCommissioningParameters.h"
2826
#import "MTRConversion.h"
2927
#import "MTRDefines_Internal.h"
30-
#import "MTRDeviceControllerDelegateBridge.h"
3128
#import "MTRDeviceControllerFactory_Internal.h"
3229
#import "MTRDeviceControllerLocalTestStorage.h"
3330
#import "MTRDeviceControllerStartupParams.h"
@@ -43,40 +40,16 @@
4340
#import "MTRLogging_Internal.h"
4441
#import "MTRMetricKeys.h"
4542
#import "MTRMetricsCollector.h"
46-
#import "MTRP256KeypairBridge.h"
4743
#import "MTRPersistentStorageDelegateBridge.h"
48-
#import "MTRServerEndpoint_Internal.h"
4944
#import "MTRSetupPayload.h"
5045
#import "MTRTimeUtils.h"
5146
#import "MTRUnfairLock.h"
5247
#import "MTRUtilities.h"
5348
#import "NSDataSpanConversion.h"
5449
#import "NSStringSpanConversion.h"
55-
#import <setup_payload/ManualSetupPayloadGenerator.h>
56-
#import <setup_payload/SetupPayload.h>
57-
#import <zap-generated/MTRBaseClusters.h>
5850

59-
#import "MTRDeviceAttestationDelegateBridge.h"
60-
#import "MTRDeviceConnectionBridge.h"
61-
62-
#include <platform/CHIPDeviceConfig.h>
63-
64-
#include <app-common/zap-generated/cluster-objects.h>
65-
#include <app/data-model/List.h>
6651
#include <app/server/Dnssd.h>
67-
#include <controller/CHIPDeviceController.h>
68-
#include <controller/CHIPDeviceControllerFactory.h>
69-
#include <controller/CommissioningWindowOpener.h>
70-
#include <credentials/FabricTable.h>
71-
#include <credentials/GroupDataProvider.h>
72-
#include <credentials/attestation_verifier/DacOnlyPartialAttestationVerifier.h>
73-
#include <credentials/attestation_verifier/DefaultDeviceAttestationVerifier.h>
74-
#include <inet/InetInterface.h>
75-
#include <lib/core/CHIPVendorIdentifiers.hpp>
76-
#include <platform/LockTracker.h>
77-
#include <platform/PlatformManager.h>
78-
#include <setup_payload/ManualSetupPayloadGenerator.h>
79-
#include <system/SystemClock.h>
52+
#include <crypto/CHIPCryptoPAL.h>
8053

8154
#include <atomic>
8255
#include <dns_sd.h>
@@ -119,22 +92,10 @@ - (instancetype)initWithDelegate:(id<MTRDeviceControllerDelegate>)delegate queue
11992
@end
12093

12194
@implementation MTRDeviceController {
122-
chip::Credentials::PartialDACVerifier * _partialDACVerifier;
123-
chip::Credentials::DefaultDACVerifier * _defaultDACVerifier;
124-
MTRDeviceControllerDelegateBridge * _deviceControllerDelegateBridge;
125-
MTRDeviceAttestationDelegateBridge * _deviceAttestationDelegateBridge;
12695
os_unfair_lock _underlyingDeviceMapLock;
127-
MTRCommissionableBrowser * _commissionableBrowser;
128-
MTRAttestationTrustStoreBridge * _attestationTrustStoreBridge;
129-
130-
// _serverEndpoints is only touched on the Matter queue.
131-
NSMutableArray<MTRServerEndpoint *> * _serverEndpoints;
13296

133-
MTRDeviceStorageBehaviorConfiguration * _storageBehaviorConfiguration;
13497
std::atomic<chip::FabricIndex> _storedFabricIndex;
13598
std::atomic<std::optional<uint64_t>> _storedCompressedFabricID;
136-
MTRP256KeypairBridge _signingKeypairBridge;
137-
MTRP256KeypairBridge _operationalKeypairBridge;
13899

139100
// For now, we just ensure that access to _suspended is atomic, but don't
140101
// guarantee atomicity of the the entire suspend/resume operation. The

0 commit comments

Comments
 (0)