Fix of the several messages that misuse the List type

Makefile

@@ -79,7 +79,7 @@ run-secc:
 
 
 mypy:
-	mypy --config-file ../mypy.ini iso15118 tests
+	mypy --config-file mypy.ini iso15118 tests
 
 reformat:
 	isort iso15118 tests && black --line-length=88 iso15118 tests
@@ -88,7 +88,7 @@ black:
 	black --check --diff --line-length=88 iso15118 tests
 
 flake8:
-	flake8 --config ../.flake8 iso15118 tests
+	flake8 --config .flake8 iso15118 tests
 
 code-quality: reformat mypy black flake8
 

iso15118/evcc/controller/interface.py

@@ -4,23 +4,22 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import List, Optional, Tuple, Union
+from typing import List, Optional, Tuple
 
 from iso15118.shared.messages.enums import Protocol
 from iso15118.shared.messages.iso15118_2.datatypes import (
     ACEVChargeParameter,
     ChargeProgress,
+    ChargingProfile,
     DCEVChargeParameter,
-    EnergyTransferMode,
     EnergyTransferModeEnum,
-    ProfileEntry,
-    SAScheduleTuple,
+    SAScheduleTupleEntry,
 )
 from iso15118.shared.messages.iso15118_20.ac import (
     ACChargeParameterDiscoveryReqParams,
     BPTACChargeParameterDiscoveryReqParams,
 )
-from iso15118.shared.messages.iso15118_20.common_messages import EMAID
+from iso15118.shared.messages.iso15118_20.common_messages import EMAIDList
 
 
 @dataclass
@@ -127,8 +126,8 @@ def is_cert_install_needed(self) -> bool:
 
     @abstractmethod
     def process_sa_schedules(
-        self, sa_schedules: List[SAScheduleTuple]
-    ) -> Tuple[ChargeProgress, int, List[ProfileEntry]]:
+        self, sa_schedules: List[SAScheduleTupleEntry]
+    ) -> Tuple[ChargeProgress, int, ChargingProfile]:
         """
         Processes the SAScheduleList provided with the ChargeParameterDiscoveryRes
         to decide which of the offered schedules to choose and whether or not to
@@ -184,7 +183,7 @@ def store_contract_cert_and_priv_key(self, contract_cert: bytes, priv_key: bytes
         raise NotImplementedError
 
     @abstractmethod
-    def get_prioritised_emaids(self) -> Optional[List[EMAID]]:
+    def get_prioritised_emaids(self) -> Optional[EMAIDList]:
         """
         Indicates the list of EMAIDs (E-Mobility Account IDs) referencing contract
         certificates that shall be installed into the EV. The EMAIDs are given in

iso15118/evcc/controller/simulator.py

@@ -12,22 +12,22 @@
 from iso15118.shared.messages.iso15118_2.datatypes import (
     ACEVChargeParameter,
     ChargeProgress,
+    ChargingProfile,
     EnergyTransferModeEnum,
-    ProfileEntry,
     ProfileEntryDetails,
     PVEAmount,
     PVEVMaxCurrent,
     PVEVMaxVoltage,
     PVEVMinCurrent,
     PVPMax,
-    SAScheduleTuple,
+    SAScheduleTupleEntry,
     UnitSymbol,
 )
 from iso15118.shared.messages.iso15118_20.ac import (
     ACChargeParameterDiscoveryReqParams,
     BPTACChargeParameterDiscoveryReqParams,
 )
-from iso15118.shared.messages.iso15118_20.common_messages import EMAID
+from iso15118.shared.messages.iso15118_20.common_messages import EMAIDList
 from iso15118.shared.messages.iso15118_20.common_types import RationalNumber
 from iso15118.shared.network import get_nic_mac_address
 
@@ -114,23 +114,22 @@ def is_cert_install_needed(self) -> bool:
         return True
 
     def process_sa_schedules(
-        self, sa_schedules: List[SAScheduleTuple]
-    ) -> Tuple[ChargeProgress, int, List[ProfileEntry]]:
+        self, sa_schedules: List[SAScheduleTupleEntry]
+    ) -> Tuple[ChargeProgress, int, ChargingProfile]:
         """Overrides EVControllerInterface.process_sa_schedules()."""
         schedule = sa_schedules.pop()
-        profile_entry_list: List[ProfileEntry] = []
+        profile_entry_list: List[ProfileEntryDetails] = []
 
         # The charging schedule coming from the SECC is called 'schedule', the
         # pendant coming from the EVCC (after having processed the offered
         # schedule(s)) is called 'profile'. Therefore, we use the prefix
         # 'schedule_' for data from the SECC, and 'profile_' for data from the EVCC.
-        for p_max_schedule_entry in schedule.tuple.p_max_schedule:
-            schedule_entry_details = p_max_schedule_entry.entry_details
+        for schedule_entry_details in schedule.p_max_schedule.entry_details:
             profile_entry_details = ProfileEntryDetails(
                 start=schedule_entry_details.time_interval.start,
                 max_power=schedule_entry_details.p_max,
             )
-            profile_entry_list.append(ProfileEntry(entry_details=profile_entry_details))
+            profile_entry_list.append(profile_entry_details)
 
             # The last PMaxSchedule element has an optional 'duration' field. if
             # 'duration' is present, then there'll be no more PMaxSchedule element
@@ -145,17 +144,15 @@ def process_sa_schedules(
                     ),
                     max_power=zero_power,
                 )
-                profile_entry_list.append(
-                    ProfileEntry(entry_details=last_profile_entry_details)
-                )
+                profile_entry_list.append(last_profile_entry_details)
 
         # TODO If a SalesTariff is present and digitally signed (and TLS is used),
         #      verify each sales tariff with the mobility operator sub 2 certificate
 
         return (
             ChargeProgress.START,
-            schedule.tuple.sa_schedule_tuple_id,
-            profile_entry_list,
+            schedule.sa_schedule_tuple_id,
+            ChargingProfile(profile_entries=profile_entry_list),
         )
 
     def continue_charging(self) -> bool:
@@ -175,5 +172,5 @@ def store_contract_cert_and_priv_key(self, contract_cert: bytes, priv_key: bytes
         # TODO Need to store the contract cert and private key
         pass
 
-    def get_prioritised_emaids(self) -> Optional[List[EMAID]]:
+    def get_prioritised_emaids(self) -> Optional[EMAIDList]:
         return None

iso15118/evcc/evcc_settings.py

@@ -50,8 +50,8 @@ def load_envs(self, env_path: Optional[str] = None) -> None:
 
         self.log_level = env.str("LOG_LEVEL", default="INFO")
 
-        # Choose the EVController implementation. Must be the class name of the controller
-        # that implements the EVControllerInterface
+        # Choose the EVController implementation. Must be the class name of the
+        # controller that implements the EVControllerInterface
         self.ev_controller = EVControllerInterface
         if env.bool("EVCC_CONTROLLER_SIM", default=False):
             self.ev_controller = SimEVController
@@ -70,13 +70,15 @@ def load_envs(self, env_path: Optional[str] = None) -> None:
             "MAX_CONTRACT_CERTS", default=3, validate=Range(min=1, max=65535)
         )
 
-        # Indicates the security level (either TCP (unencrypted) or TLS (encrypted)) the EVCC
-        # shall send in the SDP request
+        # Indicates the security level (either TCP (unencrypted) or TLS (encrypted))
+        # the EVCC shall send in the SDP request
         self.use_tls = env.bool("EVCC_USE_TLS", default=True)
 
-        # Indicates whether or not the EVCC should always enforce a TLS-secured communication
-        # session. If True, the EVCC will only continue setting up a communication session if
-        # the SECC's SDP response has the Security field set to the enum value Security.TLS.
+        # Indicates whether or not the EVCC should always enforce a TLS-secured
+        # communication session.
+        # If True, the EVCC will only continue setting up a communication session if
+        # the SECC's SDP response has the Security field set
+        # to the enum value Security.TLS.
         # If the USE_TLS setting is set to False and ENFORCE_TLS is set to True, then
         # ENFORCE_TLS overrules USE_TLS.
         self.enforce_tls = env.bool("EVCC_ENFORCE_TLS", default=False)

iso15118/evcc/states/evcc_state.py

@@ -6,22 +6,15 @@
 from typing import Optional, Type, TypeVar, Union
 
 from iso15118.evcc.comm_session_handler import EVCCCommunicationSession
-from iso15118.shared.exceptions import FaultyStateImplementationError
 from iso15118.shared.messages.app_protocol import (
     SupportedAppProtocolReq,
     SupportedAppProtocolRes,
 )
 from iso15118.shared.messages.iso15118_2.body import BodyBase, Response
-from iso15118.shared.messages.iso15118_2.body import (
-    SessionSetupReq as SessionSetupReqV2,
-)
 from iso15118.shared.messages.iso15118_2.body import (
     SessionSetupRes as SessionSetupResV2,
 )
 from iso15118.shared.messages.iso15118_2.msgdef import V2GMessage as V2GMessageV2
-from iso15118.shared.messages.iso15118_20.common_messages import (
-    SessionSetupReq as SessionSetupReqV20,
-)
 from iso15118.shared.messages.iso15118_20.common_messages import (
     SessionSetupRes as SessionSetupResV20,
 )

iso15118/evcc/states/iso15118_20_states.py

@@ -165,8 +165,8 @@ def process_message(
                             )
                         )
                     ],
-                    max_contract_cert_chains=self.comm_session.config.max_contract_certs,
-                    prioritized_emaids=self.comm_session.ev_controller.get_prioritised_emaids(),
+                    max_contract_cert_chains=self.comm_session.config.max_contract_certs,  # noqa: E501
+                    prioritized_emaids=self.comm_session.ev_controller.get_prioritised_emaids(),  # noqa: E501
                 )
 
                 self.create_next_message(
@@ -178,7 +178,7 @@ def process_message(
             except PrivateKeyReadError as exc:
                 self.stop_state_machine(
                     "Can't read private key necessary to sign "
-                    f"CertificateInstallationReq: {exc.error}"
+                    f"CertificateInstallationReq: {exc}"
                 )
                 return
 
@@ -213,7 +213,7 @@ def process_message(
                 except PrivateKeyReadError as exc:
                     self.stop_state_machine(
                         "Can't read private key necessary to sign "
-                        f"AuthorizationReq: {exc.error}"
+                        f"AuthorizationReq: {exc}"
                     )
                     return
             else: