Refactor feed code

ssb/tests/test_feed.py

@@ -2,29 +2,29 @@ from base64 import b64decode
 from collections import OrderedDict
 
 import pytest
+from nacl.signing import SigningKey
 
-from ssb.feed import Message
-from ssb.keys import KeyPair
+from ssb.feed import LocalMessage, LocalFeed
 
 
 @pytest.fixture()
-def keypair():
+def feed():
     secret = b64decode('Mz2qkNOP2K6upnqibWrR+z8pVUI1ReA1MLc7QMtF2qQ=')
-    return KeyPair(secret)
+    return LocalFeed(SigningKey(secret))
 
 
-def test_keypair():
+def test_feed():
     secret = b64decode('Mz2qkNOP2K6upnqibWrR+z8pVUI1ReA1MLc7QMtF2qQ=')
-    kp = KeyPair(secret)
-    assert bytes(kp.private_key) == secret
-    assert bytes(kp.public_key) == b64decode('I/4cyN/jPBbDsikbHzAEvmaYlaJK33lW3UhWjNXjyrU=')
-    assert kp.tag == '@I/4cyN/jPBbDsikbHzAEvmaYlaJK33lW3UhWjNXjyrU=.ed25519'
+    feed = LocalFeed(SigningKey(secret))
+    assert bytes(feed.private_key) == secret
+    assert bytes(feed.public_key) == b64decode('I/4cyN/jPBbDsikbHzAEvmaYlaJK33lW3UhWjNXjyrU=')
+    assert feed.id == '@I/4cyN/jPBbDsikbHzAEvmaYlaJK33lW3UhWjNXjyrU=.ed25519'
 
 
-def test_message(keypair):
-    m1 = Message(keypair, OrderedDict([
+def test_message(feed):
+    m1 = LocalMessage(feed, OrderedDict([
         ('type', 'about'),
-        ('about', keypair.tag),
+        ('about', feed.id),
         ('name', 'neo'),
         ('description', 'The Chosen One')
     ]), timestamp=1495706260190)
@@ -35,9 +35,9 @@ def test_message(keypair):
         'lPsQ9P10OgeyH6u0unFgiI2wV/RQ7Q2x2ebxnXYCzsJ055TBMXphRADTKhOMS2EkUxXQ9k3amj5fnWPudGxwBQ==.sig.ed25519'
     assert m1.key == '%xRDqws/TrQmOd4aEwZ32jdLhP873ZKjIgHlggPR0eoo=.sha256'
 
-    m2 = Message(keypair, OrderedDict([
+    m2 = LocalMessage(feed, OrderedDict([
         ('type', 'about'),
-        ('about', keypair.tag),
+        ('about', feed.id),
         ('name', 'morpheus'),
         ('description', 'Dude with big jaw')
     ]), previous=m1, timestamp=1495706447426)