From 1c9c28bc0e78f26b955d10f506bbd5929c3b6d79 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 26 May 2024 22:13:45 -0400 Subject: [PATCH 01/10] no-transport mode Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 20 +++++++- aries_cloudagent/config/logging.py | 72 +++++++++++++++-------------- aries_cloudagent/core/conductor.py | 56 ++++++++++++---------- 3 files changed, 87 insertions(+), 61 deletions(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index 96e5961f1c..e65bfa782b 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -680,7 +680,9 @@ def get_settings(self, args: Namespace) -> dict: if args.storage_type: settings["storage_type"] = args.storage_type - if args.endpoint: + if args.no_transport: + pass + elif args.endpoint: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] else: @@ -1273,6 +1275,19 @@ class TransportGroup(ArgumentGroup): def add_arguments(self, parser: ArgumentParser): """Add transport-specific command line arguments to the parser.""" + parser.add_argument( + "--no-transport", + dest="no_transport", + action="store_true", + env_var="ACAPY_NO_TRANSPORT", + help=( + "Specifies that aca-py will run with no transport configured. " + "This must be set if running in no-transport mode. Overrides any " + "specified transport or endpoint configurations. " + "Either this parameter or the " + "'--endpoint' parameter MUST be specified. Default: false." + ), + ) parser.add_argument( "-it", "--inbound-transport", @@ -1381,6 +1396,9 @@ def add_arguments(self, parser: ArgumentParser): def get_settings(self, args: Namespace): """Extract transport settings.""" settings = {} + if args.no_transport: + settings["transport.no_transport"] = args.no_transport + return settings if args.inbound_transports: settings["transport.inbound_configs"] = args.inbound_transports else: diff --git a/aries_cloudagent/config/logging.py b/aries_cloudagent/config/logging.py index 174c5d1bb8..9e0b115c1c 100644 --- a/aries_cloudagent/config/logging.py +++ b/aries_cloudagent/config/logging.py @@ -324,45 +324,47 @@ def print_banner( # Title banner.title(agent_label or "ACA") # Inbound transports - banner.subtitle("Inbound Transports") - internal_in_transports = [ - f"{transport.scheme}://{transport.host}:{transport.port}" - for transport in inbound_transports.values() - if not transport.is_external - ] - if internal_in_transports: - banner.list(internal_in_transports) - external_in_transports = [ - f"{transport.scheme}://{transport.host}:{transport.port}" - for transport in inbound_transports.values() - if transport.is_external - ] - if external_in_transports: - banner.subtitle(" External Plugin") - banner.list(external_in_transports) + if inbound_transports: + banner.subtitle("Inbound Transports") + internal_in_transports = [ + f"{transport.scheme}://{transport.host}:{transport.port}" + for transport in inbound_transports.values() + if not transport.is_external + ] + if internal_in_transports: + banner.list(internal_in_transports) + external_in_transports = [ + f"{transport.scheme}://{transport.host}:{transport.port}" + for transport in inbound_transports.values() + if transport.is_external + ] + if external_in_transports: + banner.subtitle(" External Plugin") + banner.list(external_in_transports) # Outbound transports - banner.subtitle("Outbound Transports") - internal_schemes = set().union( - *( - transport.schemes - for transport in outbound_transports.values() - if not transport.is_external + if outbound_transports: + banner.subtitle("Outbound Transports") + internal_schemes = set().union( + *( + transport.schemes + for transport in outbound_transports.values() + if not transport.is_external + ) ) - ) - if internal_schemes: - banner.list([f"{scheme}" for scheme in sorted(internal_schemes)]) - - external_schemes = set().union( - *( - transport.schemes - for transport in outbound_transports.values() - if transport.is_external + if internal_schemes: + banner.list([f"{scheme}" for scheme in sorted(internal_schemes)]) + + external_schemes = set().union( + *( + transport.schemes + for transport in outbound_transports.values() + if transport.is_external + ) ) - ) - if external_schemes: - banner.subtitle(" External Plugin") - banner.list([f"{scheme}" for scheme in sorted(external_schemes)]) + if external_schemes: + banner.subtitle(" External Plugin") + banner.list([f"{scheme}" for scheme in sorted(external_schemes)]) # DID info if public_did: diff --git a/aries_cloudagent/core/conductor.py b/aries_cloudagent/core/conductor.py index 9c60a32606..ab5c3f0a7e 100644 --- a/aries_cloudagent/core/conductor.py +++ b/aries_cloudagent/core/conductor.py @@ -191,20 +191,22 @@ async def setup(self): ): LOGGER.warning("No ledger configured") - # Register all inbound transports - self.inbound_transport_manager = InboundTransportManager( - self.root_profile, self.inbound_message_router, self.handle_not_returned - ) - await self.inbound_transport_manager.setup() - context.injector.bind_instance( - InboundTransportManager, self.inbound_transport_manager - ) + if not context.settings.get("transport.no_transport"): + # Register all inbound transports if enabled + self.inbound_transport_manager = InboundTransportManager( + self.root_profile, self.inbound_message_router, self.handle_not_returned + ) + await self.inbound_transport_manager.setup() + context.injector.bind_instance( + InboundTransportManager, self.inbound_transport_manager + ) - # Register all outbound transports - self.outbound_transport_manager = OutboundTransportManager( - self.root_profile, self.handle_not_delivered - ) - await self.outbound_transport_manager.setup() + if not context.settings.get("transport.no_transport"): + # Register all outbound transports + self.outbound_transport_manager = OutboundTransportManager( + self.root_profile, self.handle_not_delivered + ) + await self.outbound_transport_manager.setup() # Initialize dispatcher self.dispatcher = Dispatcher(self.root_profile) @@ -286,17 +288,18 @@ async def start(self) -> None: context = self.root_profile.context await self.check_for_valid_wallet_type(self.root_profile) - # Start up transports - try: - await self.inbound_transport_manager.start() - except Exception: - LOGGER.exception("Unable to start inbound transports") - raise - try: - await self.outbound_transport_manager.start() - except Exception: - LOGGER.exception("Unable to start outbound transports") - raise + if not context.settings.get("transport.no_transport"): + # Start up transports if enabled + try: + await self.inbound_transport_manager.start() + except Exception: + LOGGER.exception("Unable to start inbound transports") + raise + try: + await self.outbound_transport_manager.start() + except Exception: + LOGGER.exception("Unable to start outbound transports") + raise # Start up Admin server if self.admin_server: @@ -316,7 +319,10 @@ async def start(self) -> None: # Get agent label default_label = context.settings.get("default_label") - # Show some details about the configuration to the user + if context.settings.get("transport.no_transport"): + self.inbound_transport_manager.registered_transports = None + self.outbound_transport_manager.registered_transports = None + LoggingConfigurator.print_banner( default_label, self.inbound_transport_manager.registered_transports, From f8a188bdabf8ad4c9eecab7be7f58c987a1a1fa2 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 26 May 2024 22:16:37 -0400 Subject: [PATCH 02/10] no-transport mode Signed-off-by: pstlouis --- aries_cloudagent/core/conductor.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/aries_cloudagent/core/conductor.py b/aries_cloudagent/core/conductor.py index ab5c3f0a7e..87cc426dae 100644 --- a/aries_cloudagent/core/conductor.py +++ b/aries_cloudagent/core/conductor.py @@ -320,16 +320,22 @@ async def start(self) -> None: default_label = context.settings.get("default_label") if context.settings.get("transport.no_transport"): - self.inbound_transport_manager.registered_transports = None - self.outbound_transport_manager.registered_transports = None - - LoggingConfigurator.print_banner( - default_label, - self.inbound_transport_manager.registered_transports, - self.outbound_transport_manager.registered_transports, - self.setup_public_did and self.setup_public_did.did, - self.admin_server, - ) + LoggingConfigurator.print_banner( + default_label, + None, + None, + self.setup_public_did and self.setup_public_did.did, + self.admin_server, + ) + else: + LoggingConfigurator.print_banner( + default_label, + self.inbound_transport_manager.registered_transports, + self.outbound_transport_manager.registered_transports, + self.setup_public_did and self.setup_public_did.did, + self.admin_server, + ) + LoggingConfigurator.print_notices(context.settings) # record ACA-Py version in Wallet, if needed From 7e72739c64cb73a0bc64e0c6c5cc62c2b2e2dc27 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 9 Jun 2024 13:32:44 -0400 Subject: [PATCH 03/10] skip protocol registration if set to true, same for --no-ledger. set in sessions to 0 if no inbound transport manager Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 50 +++++++++++++--------- aries_cloudagent/config/default_context.py | 8 +++- aries_cloudagent/core/conductor.py | 17 +++++--- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index e65bfa782b..776d07337a 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -677,16 +677,22 @@ def get_settings(self, args: Namespace) -> dict: reduce(lambda v, k: {k: v}, key.split(".")[::-1], value), ) + settings["transport"] = False if args.no_transport else True + settings["ledger"] = False if args.no_ledger else True + if args.storage_type: settings["storage_type"] = args.storage_type - if args.no_transport: - pass elif args.endpoint: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] - else: + + elif settings["transport"]: raise ArgsParseError("-e/--endpoint is required") + + else: + pass + if args.profile_endpoint: settings["profile_endpoint"] = args.profile_endpoint @@ -1397,30 +1403,32 @@ def get_settings(self, args: Namespace): """Extract transport settings.""" settings = {} if args.no_transport: - settings["transport.no_transport"] = args.no_transport - return settings - if args.inbound_transports: - settings["transport.inbound_configs"] = args.inbound_transports - else: - raise ArgsParseError("-it/--inbound-transport is required") - if args.outbound_transports: - settings["transport.outbound_configs"] = args.outbound_transports + settings["transport.disabled"] = True else: - raise ArgsParseError("-ot/--outbound-transport is required") - settings["transport.enable_undelivered_queue"] = args.enable_undelivered_queue + if args.inbound_transports: + settings["transport.inbound_configs"] = args.inbound_transports + else: + raise ArgsParseError("-it/--inbound-transport is required") + if args.outbound_transports: + settings["transport.outbound_configs"] = args.outbound_transports + else: + raise ArgsParseError("-ot/--outbound-transport is required") + settings["transport.enable_undelivered_queue"] = ( + args.enable_undelivered_queue + ) + if args.max_message_size: + settings["transport.max_message_size"] = args.max_message_size + if args.max_outbound_retry: + settings["transport.max_outbound_retry"] = args.max_outbound_retry + if args.ws_heartbeat_interval: + settings["transport.ws.heartbeat_interval"] = args.ws_heartbeat_interval + if args.ws_timeout_interval: + settings["transport.ws.timeout_interval"] = args.ws_timeout_interval if args.label: settings["default_label"] = args.label if args.image_url: settings["image_url"] = args.image_url - if args.max_message_size: - settings["transport.max_message_size"] = args.max_message_size - if args.max_outbound_retry: - settings["transport.max_outbound_retry"] = args.max_outbound_retry - if args.ws_heartbeat_interval: - settings["transport.ws.heartbeat_interval"] = args.ws_heartbeat_interval - if args.ws_timeout_interval: - settings["transport.ws.timeout_interval"] = args.ws_timeout_interval return settings diff --git a/aries_cloudagent/config/default_context.py b/aries_cloudagent/config/default_context.py index 3bd323a171..e062ab1248 100644 --- a/aries_cloudagent/config/default_context.py +++ b/aries_cloudagent/config/default_context.py @@ -116,11 +116,15 @@ async def load_plugins(self, context: InjectionContext): context.injector.bind_instance(PluginRegistry, plugin_registry) # Register standard protocol plugins - plugin_registry.register_package("aries_cloudagent.protocols") + if not self.settings.get("transport.disabled"): + plugin_registry.register_package("aries_cloudagent.protocols") # Currently providing admin routes only plugin_registry.register_plugin("aries_cloudagent.holder") - plugin_registry.register_plugin("aries_cloudagent.ledger") + + if not self.settings.get("ledger.disabled"): + plugin_registry.register_package("aries_cloudagent.ledger") + plugin_registry.register_plugin("aries_cloudagent.messaging.jsonld") plugin_registry.register_plugin("aries_cloudagent.resolver") plugin_registry.register_plugin("aries_cloudagent.settings") diff --git a/aries_cloudagent/core/conductor.py b/aries_cloudagent/core/conductor.py index 87cc426dae..315f7c0d46 100644 --- a/aries_cloudagent/core/conductor.py +++ b/aries_cloudagent/core/conductor.py @@ -627,7 +627,11 @@ def dispatch_complete(self, message: InboundMessage, completed: CompletedTask): async def get_stats(self) -> dict: """Get the current stats tracked by the conductor.""" stats = { - "in_sessions": len(self.inbound_transport_manager.sessions), + "in_sessions": ( + len(self.inbound_transport_manager.sessions) + if self.inbound_transport_manager + else 0 + ), "out_encode": 0, "out_deliver": 0, "task_active": self.dispatcher.task_queue.current_active, @@ -635,11 +639,12 @@ async def get_stats(self) -> dict: "task_failed": self.dispatcher.task_queue.total_failed, "task_pending": self.dispatcher.task_queue.current_pending, } - for m in self.outbound_transport_manager.outbound_buffer: - if m.state == QueuedOutboundMessage.STATE_ENCODE: - stats["out_encode"] += 1 - if m.state == QueuedOutboundMessage.STATE_DELIVER: - stats["out_deliver"] += 1 + if self.outbound_transport_manager: + for m in self.outbound_transport_manager.outbound_buffer: + if m.state == QueuedOutboundMessage.STATE_ENCODE: + stats["out_encode"] += 1 + if m.state == QueuedOutboundMessage.STATE_DELIVER: + stats["out_deliver"] += 1 return stats async def outbound_message_router( From 4c60206a402300a38bdde7e8c18d0be76710a0ef Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 9 Jun 2024 14:14:47 -0400 Subject: [PATCH 04/10] fix missing Namespace attribute Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index 776d07337a..fe1ab7c609 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -677,9 +677,6 @@ def get_settings(self, args: Namespace) -> dict: reduce(lambda v, k: {k: v}, key.split(".")[::-1], value), ) - settings["transport"] = False if args.no_transport else True - settings["ledger"] = False if args.no_ledger else True - if args.storage_type: settings["storage_type"] = args.storage_type @@ -687,12 +684,9 @@ def get_settings(self, args: Namespace) -> dict: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] - elif settings["transport"]: + elif not args.no_transport: raise ArgsParseError("-e/--endpoint is required") - else: - pass - if args.profile_endpoint: settings["profile_endpoint"] = args.profile_endpoint From 2fe462f797ee301fef12a1ca0bce880e22ef30f3 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 16 Jun 2024 18:05:31 -0400 Subject: [PATCH 05/10] hide deprecation warning about didcomm if transport is disabled Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 2 +- aries_cloudagent/config/logging.py | 51 +++++++++++++++-------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index fe1ab7c609..6e515d5811 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -684,7 +684,7 @@ def get_settings(self, args: Namespace) -> dict: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] - elif not args.no_transport: + elif args.no_transport: raise ArgsParseError("-e/--endpoint is required") if args.profile_endpoint: diff --git a/aries_cloudagent/config/logging.py b/aries_cloudagent/config/logging.py index 9e0b115c1c..90e2a4bc6b 100644 --- a/aries_cloudagent/config/logging.py +++ b/aries_cloudagent/config/logging.py @@ -389,36 +389,39 @@ def print_banner( def print_notices(cls, settings: Settings): """Print notices and warnings.""" with Banner(border=":", length=80, file=sys.stderr) as banner: - banner.centered("⚠ DEPRECATION NOTICE: ⚠") - banner.hr() if settings.get("wallet.type", "in_memory").lower() == "indy": + banner.centered("⚠ DEPRECATION NOTICE: ⚠") + banner.hr() banner.print( "The Indy wallet type is deprecated, use Askar instead; see: " "https://aca-py.org/main/deploying/IndySDKtoAskarMigration/", ) banner.hr() - banner.print( - "Receiving a core DIDComm protocol with the " - "`did:sov:BzCbsNYhMrjHiqZDTUASHg;spec` prefix is deprecated. All parties " - "sending this prefix should be notified that support for receiving such " - "messages will be removed in a future release. " - "Use https://didcomm.org/ instead." - ) - banner.hr() - banner.print( - "Aries RFC 0160: Connection Protocol is deprecated and support will be " - "removed in a future release; use RFC 0023: DID Exchange instead." - ) - banner.hr() - banner.print( - "Aries RFC 0036: Issue Credential 1.0 is deprecated and support will be " - "removed in a future release; use RFC 0453: Issue Credential 2.0 instead." - ) - banner.hr() - banner.print( - "Aries RFC 0037: Present Proof 1.0 is deprecated and support will be " - "removed in a future release; use RFC 0454: Present Proof 2.0 instead." - ) + if not settings.get("transport.disabled"): + banner.centered("⚠ DEPRECATION NOTICE: ⚠") + banner.hr() + banner.print( + "Receiving a core DIDComm protocol with the " + "`did:sov:BzCbsNYhMrjHiqZDTUASHg;spec` prefix is deprecated. All parties " + "sending this prefix should be notified that support for receiving such " + "messages will be removed in a future release. " + "Use https://didcomm.org/ instead." + ) + banner.hr() + banner.print( + "Aries RFC 0160: Connection Protocol is deprecated and support will be " + "removed in a future release; use RFC 0023: DID Exchange instead." + ) + banner.hr() + banner.print( + "Aries RFC 0036: Issue Credential 1.0 is deprecated and support will be " + "removed in a future release; use RFC 0453: Issue Credential 2.0 instead." + ) + banner.hr() + banner.print( + "Aries RFC 0037: Present Proof 1.0 is deprecated and support will be " + "removed in a future release; use RFC 0454: Present Proof 2.0 instead." + ) print() From 501c82ccc5a781102855801549fce5138fa7f542 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 16 Jun 2024 18:25:01 -0400 Subject: [PATCH 06/10] reduce line lenght Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 2 +- aries_cloudagent/config/logging.py | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index 6e515d5811..18ee0ff984 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -684,7 +684,7 @@ def get_settings(self, args: Namespace) -> dict: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] - elif args.no_transport: + elif 'no_transport' not in args: raise ArgsParseError("-e/--endpoint is required") if args.profile_endpoint: diff --git a/aries_cloudagent/config/logging.py b/aries_cloudagent/config/logging.py index 90e2a4bc6b..7af8366ebe 100644 --- a/aries_cloudagent/config/logging.py +++ b/aries_cloudagent/config/logging.py @@ -402,25 +402,28 @@ def print_notices(cls, settings: Settings): banner.hr() banner.print( "Receiving a core DIDComm protocol with the " - "`did:sov:BzCbsNYhMrjHiqZDTUASHg;spec` prefix is deprecated. All parties " - "sending this prefix should be notified that support for receiving such " - "messages will be removed in a future release. " + "`did:sov:BzCbsNYhMrjHiqZDTUASHg;spec` prefix is deprecated. " + "All parties sending this prefix should be notified that support " + "for receiving such messages will be removed in a future release. " "Use https://didcomm.org/ instead." ) banner.hr() banner.print( - "Aries RFC 0160: Connection Protocol is deprecated and support will be " - "removed in a future release; use RFC 0023: DID Exchange instead." + "Aries RFC 0160: Connection Protocol is deprecated and " + "support will be removed in a future release; " + "use RFC 0023: DID Exchange instead." ) banner.hr() banner.print( - "Aries RFC 0036: Issue Credential 1.0 is deprecated and support will be " - "removed in a future release; use RFC 0453: Issue Credential 2.0 instead." + "Aries RFC 0036: Issue Credential 1.0 is deprecated " + "and support will be removed in a future release; " + "use RFC 0453: Issue Credential 2.0 instead." ) banner.hr() banner.print( - "Aries RFC 0037: Present Proof 1.0 is deprecated and support will be " - "removed in a future release; use RFC 0454: Present Proof 2.0 instead." + "Aries RFC 0037: Present Proof 1.0 is deprecated " + "and support will be removed in a future release; " + "use RFC 0454: Present Proof 2.0 instead." ) print() From cff0826a57838ccc868e8cd04e44ae1da6f220b9 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 16 Jun 2024 18:29:53 -0400 Subject: [PATCH 07/10] linting Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index 18ee0ff984..ca12b0e62a 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -684,7 +684,7 @@ def get_settings(self, args: Namespace) -> dict: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] - elif 'no_transport' not in args: + elif "no_transport" not in args: raise ArgsParseError("-e/--endpoint is required") if args.profile_endpoint: From 1a432cfb725d09de92830cdec68cea629ca1f889 Mon Sep 17 00:00:00 2001 From: pstlouis Date: Sun, 16 Jun 2024 19:13:20 -0400 Subject: [PATCH 08/10] change elif to if in argparse logic Signed-off-by: pstlouis --- aries_cloudagent/config/argparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries_cloudagent/config/argparse.py b/aries_cloudagent/config/argparse.py index ca12b0e62a..e9a81158fa 100644 --- a/aries_cloudagent/config/argparse.py +++ b/aries_cloudagent/config/argparse.py @@ -680,7 +680,7 @@ def get_settings(self, args: Namespace) -> dict: if args.storage_type: settings["storage_type"] = args.storage_type - elif args.endpoint: + if args.endpoint: settings["default_endpoint"] = args.endpoint[0] settings["additional_endpoints"] = args.endpoint[1:] From b831b8ed3a5d31f726c58b851e2ea1d11c41563f Mon Sep 17 00:00:00 2001 From: pstlouis Date: Mon, 17 Jun 2024 17:13:17 -0400 Subject: [PATCH 09/10] replace transport.no-transport checks for transport.disabled Signed-off-by: pstlouis --- aries_cloudagent/core/conductor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aries_cloudagent/core/conductor.py b/aries_cloudagent/core/conductor.py index 315f7c0d46..efdc35ccca 100644 --- a/aries_cloudagent/core/conductor.py +++ b/aries_cloudagent/core/conductor.py @@ -191,7 +191,7 @@ async def setup(self): ): LOGGER.warning("No ledger configured") - if not context.settings.get("transport.no_transport"): + if not context.settings.get("transport.disabled"): # Register all inbound transports if enabled self.inbound_transport_manager = InboundTransportManager( self.root_profile, self.inbound_message_router, self.handle_not_returned @@ -201,7 +201,7 @@ async def setup(self): InboundTransportManager, self.inbound_transport_manager ) - if not context.settings.get("transport.no_transport"): + if not context.settings.get("transport.disabled"): # Register all outbound transports self.outbound_transport_manager = OutboundTransportManager( self.root_profile, self.handle_not_delivered @@ -288,7 +288,7 @@ async def start(self) -> None: context = self.root_profile.context await self.check_for_valid_wallet_type(self.root_profile) - if not context.settings.get("transport.no_transport"): + if not context.settings.get("transport.disabled"): # Start up transports if enabled try: await self.inbound_transport_manager.start() @@ -319,7 +319,7 @@ async def start(self) -> None: # Get agent label default_label = context.settings.get("default_label") - if context.settings.get("transport.no_transport"): + if context.settings.get("transport.disabled"): LoggingConfigurator.print_banner( default_label, None, From 171c43c9bd6918e3b7417d3addd2fa1296c6b69e Mon Sep 17 00:00:00 2001 From: pstlouis Date: Mon, 24 Jun 2024 14:53:10 -0400 Subject: [PATCH 10/10] fix copy pasta from package to plugin Signed-off-by: pstlouis --- aries_cloudagent/config/default_context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aries_cloudagent/config/default_context.py b/aries_cloudagent/config/default_context.py index e062ab1248..24cf4b3f59 100644 --- a/aries_cloudagent/config/default_context.py +++ b/aries_cloudagent/config/default_context.py @@ -123,7 +123,7 @@ async def load_plugins(self, context: InjectionContext): plugin_registry.register_plugin("aries_cloudagent.holder") if not self.settings.get("ledger.disabled"): - plugin_registry.register_package("aries_cloudagent.ledger") + plugin_registry.register_plugin("aries_cloudagent.ledger") plugin_registry.register_plugin("aries_cloudagent.messaging.jsonld") plugin_registry.register_plugin("aries_cloudagent.resolver")