Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fabric-admin] Remove unused dependency #33538

Merged
merged 2 commits into from
May 23, 2024
Merged

[fabric-admin] Remove unused dependency #33538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e4a34f
[fabric-admin] Remove unused dependency
yufengwangca May 22, 2024
d864289
Address review comments
yufengwangca May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/fabric-admin/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ static_library("fabric-admin-utils") {

sources += [ "commands/interactive/InteractiveCommands.cpp" ]
deps += [
"${chip_root}/examples/common/websocket-server",
"${chip_root}/src/platform/logging:headers",
"${editline_root}:editline",
]
Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-admin/commands/clusters/JsonParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#include "../common/CustomStringPrefix.h"
#include <commands/common/CustomStringPrefix.h>

#include <json/json.h>
#include <lib/core/Optional.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/fabric-admin/commands/clusters/ModelCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#ifdef CONFIG_USE_LOCAL_STORAGE
#include <controller/ExamplePersistentStorage.h>
#endif // CONFIG_USE_LOCAL_STORAGE
#endif

#include "../common/CHIPCommand.h"
#include <lib/core/CHIPEncoding.h>
Expand Down
6 changes: 3 additions & 3 deletions examples/fabric-admin/commands/interactive/Commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

#pragma once

#include "commands/common/CHIPCommand.h"
#include "commands/common/Commands.h"
#include "commands/interactive/InteractiveCommands.h"
#include <commands/common/CHIPCommand.h>
#include <commands/common/Commands.h>
#include <commands/interactive/InteractiveCommands.h>

void registerCommandsInteractive(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
{
Expand Down
8 changes: 3 additions & 5 deletions examples/fabric-admin/commands/interactive/InteractiveCommands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@

#pragma once

#include "../clusters/DataModelLogger.h"
#include "../common/CHIPCommand.h"
#include "../common/Commands.h"

#include <websocket-server/WebSocketServer.h>
#include <commands/clusters/DataModelLogger.h>
#include <commands/common/CHIPCommand.h>
#include <commands/common/Commands.h>

#include <string>

Expand Down
14 changes: 7 additions & 7 deletions examples/fabric-admin/commands/pairing/Commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

#pragma once

#include "commands/common/Commands.h"
#include "commands/pairing/GetCommissionerNodeIdCommand.h"
#include "commands/pairing/GetCommissionerRootCertificateCommand.h"
#include "commands/pairing/IssueNOCChainCommand.h"
#include "commands/pairing/OpenCommissioningWindowCommand.h"
#include "commands/pairing/PairingCommand.h"
#include <commands/common/Commands.h>
#include <commands/common/CredentialIssuerCommands.h>
#include <commands/pairing/GetCommissionerNodeIdCommand.h>
#include <commands/pairing/GetCommissionerRootCertificateCommand.h>
#include <commands/pairing/IssueNOCChainCommand.h>
#include <commands/pairing/OpenCommissioningWindowCommand.h>
#include <commands/pairing/PairingCommand.h>

#include <app/server/Dnssd.h>
#include <commands/common/CredentialIssuerCommands.h>
#include <lib/dnssd/Resolver.h>

class Unpair : public PairingCommand
Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#pragma once

#include "../common/CHIPCommand.h"
#include "../common/RemoteDataModelLogger.h"
#include <commands/common/CHIPCommand.h>
#include <commands/common/RemoteDataModelLogger.h>

class GetCommissionerNodeIdCommand : public CHIPCommand
{
Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#pragma once

#include "../common/CHIPCommand.h"
#include "../common/RemoteDataModelLogger.h"
#include <commands/common/CHIPCommand.h>
#include <commands/common/RemoteDataModelLogger.h>

#include "ToTLVCert.h"

Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#pragma once

#include "../common/CHIPCommand.h"
#include "../common/RemoteDataModelLogger.h"
#include <commands/common/CHIPCommand.h>
#include <commands/common/RemoteDataModelLogger.h>

#include "ToTLVCert.h"

Expand Down
3 changes: 1 addition & 2 deletions examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@

#pragma once

#include "../common/CHIPCommand.h"

#include <commands/common/CHIPCommand.h>
#include <controller/CommissioningWindowOpener.h>
#include <lib/support/CHIPMem.h>

Expand Down
4 changes: 2 additions & 2 deletions examples/fabric-admin/commands/pairing/PairingCommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
*/

#include "PairingCommand.h"
#include "platform/PlatformManager.h"

#include <commands/common/DeviceScanner.h>
#include <controller/ExampleOperationalCredentialsIssuer.h>
#include <crypto/CHIPCryptoPAL.h>
#include <lib/core/CHIPSafeCasts.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/PlatformManager.h>
#include <protocols/secure_channel/PASESession.h>

#include <setup_payload/ManualSetupPayloadParser.h>
#include <setup_payload/QRCodeSetupPayloadParser.h>

Expand Down
5 changes: 2 additions & 3 deletions examples/fabric-admin/commands/pairing/PairingCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@

#pragma once

#include "../common/CHIPCommand.h"
#include <commands/common/CHIPCommand.h>
#include <commands/common/CredentialIssuerCommands.h>
#include <controller/CommissioningDelegate.h>
#include <controller/CurrentFabricRemover.h>

#include <commands/common/CredentialIssuerCommands.h>
#include <lib/support/Span.h>
#include <lib/support/ThreadOperationalDataset.h>

Expand Down
9 changes: 4 additions & 5 deletions examples/fabric-admin/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
*
*/

#include "commands/common/Commands.h"

#include "commands/clusters/SubscriptionsCommands.h"
#include "commands/interactive/Commands.h"
#include "commands/pairing/Commands.h"
#include <commands/clusters/SubscriptionsCommands.h>
#include <commands/common/Commands.h>
#include <commands/interactive/Commands.h>
#include <commands/pairing/Commands.h>
#include <zap-generated/cluster/Commands.h>

#include <iostream>
Expand Down
Loading