Fix qa

Author: cffls

Makefile

@@ -57,6 +57,9 @@ clean-test: ## remove test and coverage artifacts
 test: ## runs tests
 	poetry run pytest -vv -n 4
 
+test-integration: ## runs integration tests
+	cd integration-test && ./run_tests.sh
+
 test-single: ## runs tests with "single" markers
 	poetry run pytest -s -vv -m single
 

integration-test/configs/local-chang/shelley-genesis.json

@@ -21,7 +21,7 @@
         "keyDeposit": 1000000,
         "protocolVersion": {
             "minor": 0,
-            "major": 9
+            "major": 10
         },
         "poolDeposit": 1000000,
         "a0": 0.0,

integration-test/docker-compose-chang.yml

@@ -9,7 +9,7 @@ networks:
 services:
 
   cardano-node:
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.3}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.4}
     platform: linux/amd64
     entrypoint: bash
     environment:
@@ -35,7 +35,7 @@ services:
         max-file: "10"
 
   cardano-pool:
-    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.3}
+    image: ghcr.io/intersectmbo/cardano-node:${CARDANO_NODE_VERSION:-10.1.4}
     platform: linux/amd64
     entrypoint: bash
     environment:
@@ -56,7 +56,7 @@ services:
         max-file: "10"
 
   ogmios:
-    image: cardanosolutions/ogmios:v6.9.0
+    image: cardanosolutions/ogmios:v6.11.0
     platform: linux/amd64
     environment:
       NETWORK: "${NETWORK:-local-alonzo}"

integration-test/run_tests.sh

@@ -5,7 +5,7 @@ set -o pipefail
 
 ROOT=$(pwd)
 
-poetry install
+poetry install -C ..
 #poetry run pip install ogmios
 
 ##########

poetry.lock

@@ -123,7 +123,9 @@ def to_primitive(self) -> Primitive:
         return self.data.to_primitive()
 
     @classmethod
-    def from_primitive(cls: Type[AuxiliaryData], value: Primitive) -> AuxiliaryData:
+    def from_primitive(
+        cls: Type[AuxiliaryData], value: Primitive, type_args: Optional[tuple] = None
+    ) -> AuxiliaryData:
         for t in [AlonzoMetadata, ShelleyMarryMetadata, Metadata]:
             # The schema of metadata in different eras are mutually exclusive, so we can try deserializing
             # them one by one without worrying about mismatch.

pycardano/metadata.py

@@ -1009,7 +1009,7 @@ def to_shallow_primitive(self) -> Union[CBORTag, List[T]]:
 
     @classmethod
     def from_primitive(
-        cls: OrderedSet[T], value: Any, type_args: Optional[tuple] = None
+        cls: Type[OrderedSet[T]], value: Primitive, type_args: Optional[tuple] = None
     ) -> OrderedSet[T]:
         assert (
             type_args is None or len(type_args) == 1
@@ -1027,7 +1027,7 @@ def from_primitive(
                 value = [type_arg.from_primitive(v) for v in value]
             return cls(list(value), use_tag=False)
 
-        raise ValueError(f"Cannot deserialize {value} to {cls.__name__}")
+        raise ValueError(f"Cannot deserialize {value} to {cls}")
 
 
 class NonEmptyOrderedSet(OrderedSet[T]):
@@ -1040,7 +1040,9 @@ def validate(self):
 
     @classmethod
     def from_primitive(
-        cls: NonEmptyOrderedSet[T], value: Any, type_args: Optional[tuple] = None
+        cls: Type[NonEmptyOrderedSet[T]],
+        value: Primitive,
+        type_args: Optional[tuple] = None,
     ) -> NonEmptyOrderedSet[T]:
         result = cast(NonEmptyOrderedSet[T], super().from_primitive(value, type_args))
         if not result:

pycardano/serialization.py

@@ -316,7 +316,9 @@ def __post_init__(self):
             self._TYPE = self.script.version
 
     @classmethod
-    def from_primitive(cls: Type[_Script], values: List[Primitive]) -> _Script:
+    def from_primitive(
+        cls: Type[_Script], values: List[Primitive], type_args: Optional[tuple] = None
+    ) -> _Script:
         if values[0] == 0:
             return cls(NativeScript.from_primitive(values[1]))
         assert isinstance(values[1], bytes)
@@ -346,7 +348,9 @@ def to_shallow_primitive(self) -> Primitive:
 
     @classmethod
     def from_primitive(
-        cls: Type[_DatumOption], values: List[Primitive]
+        cls: Type[_DatumOption],
+        values: List[Primitive],
+        type_args: Optional[tuple] = None,
     ) -> _DatumOption:
         if values[0] == 0:
             assert isinstance(values[1], bytes)
@@ -368,7 +372,9 @@ def to_primitive(self) -> Primitive:
         return CBORTag(24, cbor2.dumps(self.script, default=default_encoder))
 
     @classmethod
-    def from_primitive(cls: Type[_ScriptRef], value: Primitive) -> _ScriptRef:
+    def from_primitive(
+        cls: Type[_ScriptRef], value: List[Primitive], type_args: Optional[tuple] = None
+    ) -> _ScriptRef:
         assert isinstance(value, CBORTag)
         return cls(_Script.from_primitive(cbor2.loads(value.value)))
 
@@ -461,7 +467,9 @@ def to_primitive(self) -> Primitive:
 
     @classmethod
     def from_primitive(
-        cls: Type[TransactionOutput], value: Primitive
+        cls: Type[TransactionOutput],
+        value: List[Primitive],
+        type_args: Optional[tuple] = None,
     ) -> TransactionOutput:
         if isinstance(value, list):
             output = _TransactionOutputLegacy.from_primitive(value)