Revert "Merge branch 'aleph-im-ok' into master"

This reverts commit a399d98, reversing
changes made to 5b514f8.

Author: MHHukiewitz

pytest.ini

@@ -464,12 +464,6 @@ def amend(
         fd.seek(0)
         new_content_json = fd.read()
 
-    content_type = type(existing_message).__annotations__["content"]
-    new_content_dict = json.loads(new_content_json)
-    new_content = content_type(**new_content_dict)
-    new_content.ref = existing_message.item_hash
-    new_message = fd.read()
-
     content_type = type(existing_message).__annotations__["content"]
     new_content_dict = json.loads(new_content_json)
     new_content = content_type(**new_content_dict)

src/aleph_client/__main__.py

@@ -10,7 +10,6 @@
 from datetime import datetime
 from functools import lru_cache
 from typing import Type
-from types import NoneType
 
 from aleph_message.models import (
     ForgetContent,
@@ -388,7 +387,7 @@ async def create_program(
 async def forget(
     account: Account,
     hashes: List[str],
-    reason: Optional[str]=None,
+    reason: Optional[str],
     storage_engine: StorageEnum = StorageEnum.storage,
     channel: str = settings.DEFAULT_CHANNEL,
     address: Optional[str] = settings.ADDRESS_TO_USE,
@@ -423,10 +422,9 @@ async def submit(
     channel: str = settings.DEFAULT_CHANNEL,
     api_server: str = settings.API_HOST,
     storage_engine: StorageEnum = StorageEnum.storage,
-    session: Optional[ClientSession]=None,
+    session: Optional[ClientSession] = None,
     inline: bool = True,
 ) -> AlephMessage:
-    
     message: Dict[str, Any] = {
         #'item_hash': ipfs_hash,
         "chain": account.CHAIN,
@@ -435,10 +433,8 @@ async def submit(
         "type": message_type,
         "time": time.time(),
     }
-    
-    item_content: str = json.dumps(content, separators=(",", ":"))
-
 
+    item_content: str = json.dumps(content, separators=(",", ":"))
 
     if inline and (len(item_content) < 50000):
         message["item_content"] = item_content
@@ -480,10 +476,9 @@ async def fetch_aggregate(
         params["limit"] = limit
 
     async with session.get(
-        f"{api_server}/api/v0/aggregates/{address}.json", 
-        params=params
+        f"{api_server}/api/v0/aggregates/{address}.json", params=params
     ) as resp:
-        result = await resp.json(encoding="utf-8", content_type="application/json" )
+        result = await resp.json()
         data = result.get("data", dict())
         return data.get(key)
 

src/aleph_client/asynchronous.py

@@ -13,6 +13,7 @@
 
 DEFAULT_HRP = "cosmos"
 
+
 def get_signable_message(message):
     signable = get_verification_buffer(message).decode("utf-8")
     content_message = {
@@ -58,7 +59,7 @@ async def sign_message(self, message):
 
         privkey = ecdsa.SigningKey.from_string(self.private_key, curve=ecdsa.SECP256k1)
         signature_compact = privkey.sign_deterministic(
-            verif.encode("ISO-8859-1"),
+            verif.encode("utf-8"),
             hashfunc=hashlib.sha256,
             sigencode=ecdsa.util.sigencode_string_canonize,
         )
@@ -79,8 +80,7 @@ def get_address(self) -> str:
 
     def get_public_key(self) -> str:
         return privkey_to_pubkey(self.private_key).decode()
-        return privkey_to_pubkey(self.private_key).decode("ISO-8859-1")
 
 
 def get_fallback_account(hrp=DEFAULT_HRP):
-    return CSDKAccount(private_key=get_fallback_private_key(), hrp=hrp)
+    return CSDKAccount(private_key=get_fallback_private_key(), hrp=hrp)

src/aleph_client/chains/cosmos.py

@@ -1,5 +1,5 @@
 import json
-from base64 import b64encode
+
 from substrateinterface import Keypair
 
 from .common import (
@@ -13,16 +13,17 @@ class DOTAccount(BaseAccount):
     CHAIN = "DOT"
     CURVE = "sr25519"
 
-    def __init__(self, mnemonics=None):
+    def __init__(self, mnemonics=None, address_type=42):
         self.mnemonics = mnemonics
+        self.address_type = address_type
         self._account = Keypair.create_from_mnemonic(
-            self.mnemonics)
+            self.mnemonics, address_type=address_type
+        )
 
     async def sign_message(self, message):
         message = self._setup_sender(message)
         verif = get_verification_buffer(message).decode("utf-8")
-        m = b64encode(b'self._account.sign(verif)').decode('utf-8')
-        sig = {"curve": self.CURVE, "data": m}
+        sig = {"curve": self.CURVE, "data": self._account.sign(verif)}
         message["signature"] = json.dumps(sig)
         return message
 

src/aleph_client/chains/substrate.py

@@ -1,5 +1,4 @@
 import os
-import time 
 from unittest.mock import MagicMock, patch, AsyncMock
 
 import pytest as pytest
@@ -9,9 +8,6 @@
     StoreMessage,
     ProgramMessage,
     ForgetMessage,
-    PostContent, 
-    MessageType, 
-    AlephMessage
 )
 
 from aleph_client.conf import settings
@@ -24,24 +20,9 @@
     create_store,
     create_program,
     forget,
-    submit
 )
 from aleph_client.chains.common import get_fallback_private_key
 from aleph_client.chains.ethereum import ETHAccount
-from build.lib.aleph_client.__main__ import post
-from build.lib.aleph_client.asynchronous import fetch_aggregates
-
-
-def new_mock_session_with_post_success():
-    mock_response = AsyncMock()
-    mock_response.json.return_value = {"status": "success"}
-
-    mock_post = AsyncMock()
-    mock_post.return_value = mock_response
-
-    mock_session = MagicMock()
-    mock_session.post.return_value.__aenter__ = mock_post
-    return mock_session
 
 
 def new_mock_session_with_post_success():
@@ -222,24 +203,3 @@ async def test_forget():
 
     assert mock_session.post.called
     assert isinstance(new_post, ForgetMessage)
-    
-@pytest.mark.asyncio
-async def fetch_aggregate():
-    
-    _get_fallback_session.cache_clear()
-    
-    if os.path.exists(settings.PRIVATE_KEY_FILE):
-            os.remove(settings.PRIVATE_KEY_FILE)
-
-    private_key = get_fallback_private_key()
-    account: ETHAccount = ETHAccount(private_key=private_key)
-    
-    mock_session = new_mock_session_with_post_success()
-
-    address = account.get_address()
-    
-    response = await fetch_aggregate(
-        address = address, 
-        key = "0xa1B3bb7d2332383D96b7796B908fB7f7F3c2Be10",
-        api_server = settings.API_HOST,
-    )