chg: Moved all examples under sample driver app.

Author: nicfit

HISTORY.rst

@@ -3,6 +3,7 @@ Release History
 
 .. :changelog:
 
+
 v0.2.0 (2017-02-04)
 -------------------------
 

MANIFEST.in

@@ -13,6 +13,7 @@ recursive-include ./tests *.py
 
 exclude .cookiecutter.yml
 exclude .gitchangelog.rc
+exclude TODO
 global-exclude __pycache__
 global-exclude .editorconfig
 global-exclude *.py[co]

bin/sample.py

@@ -1,23 +1,17 @@
 # -*- coding: utf-8 -*-
-import json
 from nicfit import Application, getLogger
 from argparse import RawDescriptionHelpFormatter
 
 from ..__about__ import __version__
 from .. import useCliqueServer
 from . import keygen   # noqa
 from . import identity  # noqa
+from . import blockchain  # noqa
+from . import examples  # noqa
 
 log = getLogger(__name__)
 
 
-def blockchain(args):
-    from .. import BlockChain, chainFactory
-    chain_data = args.chainfile.read()
-    chain = BlockChain.deserialize(chain_data, factory=chainFactory)
-    print(chain)
-
-
 def main(args):
     log.debug("Args: {}".format(args))
 
@@ -41,143 +35,13 @@ def main(args):
 Use '%(prog)s <subcmd> --help' for detailed info about a particular command.
 """  # noqa
 
-
-def contract_example(args):
-    from uuid import uuid4
-    import requests
-    from clique.blockchain import BlockChain, Block, Identity
-    from clique import keystore
-
-    ipecac = Identity("label:Ipecac", Identity.generateKey())
-    patton = Identity("artist:Mike Patton", Identity.generateKey())
-    melvins = Identity("artist:Melvins", Identity.generateKey())
-    fantômas = Identity("artist:Fantômas", Identity.generateKey())
-    buzzo = Identity("artist:King Buzzo", Identity.generateKey())
-    unsane = Identity("artist:Unsane", Identity.generateKey())
-    fnm = Identity("artist:Faith No More", Identity.generateKey())
-    for k in [i.key for i in [ipecac, patton, melvins, fantômas, buzzo,
-                              unsane, fnm]]:
-        keystore().upload(k)
-
-    c = BlockChain(ipecac)
-    godblock = c.addBlock(ipecac,
-                          sub="Ipecac recording artists: " + str(uuid4()),
-                          tid="GOD")
-    godblock.verify(ipecac.key)
-    contract = c.addBlock(patton, thing="contract", blahblah="....")
-    contract.verify(patton.key)
-    # Multiple signers
-    c.addBlock(fantômas, thing="contract", blahblah="....")
-    # XXX: Multi signing not yet suported
-    '''
-    fantômas_contract.sign(patton.key)
-    fantômas_contract.sign(melvins.key)
-    fantômas_contract.sign(buzzo.key)
-    '''
-
-    print(c)
-    GHASH = godblock.hash
-
-    ######################################################
-    CONTRACT_BLOCK_CHAIN = c.serialize()
-    print(CONTRACT_BLOCK_CHAIN)
-
-    ipecac_contracts = BlockChain.deserialize(CONTRACT_BLOCK_CHAIN)
-    ipecac_contracts.addBlock(buzzo, thing="contract", blahblah="....")
-    ipecac_contracts.addBlock(melvins, thing="contract", blahblah="....")
-
-    NEW_CHAIN = ipecac_contracts.serialize()
-    for new_block in ipecac_contracts[-2:]:
-        # upload to block server, for example
-        pass
-
-    ######################################################
-    download = NEW_CHAIN
-    melvins_crew = BlockChain.deserialize(download)
-    melvins_crew.validate(GHASH)
-    print(melvins_crew)
-    # += instead of addBlock, antecedents are computed as whith addBlock
-    melvins_crew += Block(ipecac, None, ack=True,
-                          ptk="FIXME: get fprint from block being acked")
-    melvins_crew += Block(ipecac, None, ack=True,
-                          ptk="FIXME: get fprint from block being acked")
-    print(melvins_crew)
-    CONTRACT_BLOCK_CHAIN = melvins_crew.serialize()
-
-    master = BlockChain.deserialize(CONTRACT_BLOCK_CHAIN)
-    master.addBlock(ipecac, thing="contract:offer", new_signing="Unsane",
-                    blahblah="....")
-    master.addBlock(ipecac, thing="contract:offer", new_signing="Faith No More",
-                    blahblah="....")
-    CONTRACT_BLOCK_CHAIN = master.serialize()
-
-    ######################################################
-    download = CONTRACT_BLOCK_CHAIN
-    fnm_offer = BlockChain.deserialize(download)
-    print(fnm_offer)
-    fnm_offer.validate(GHASH)
-    fnm_offer.addBlock(fnm, ack=False)
-    deny_upload = fnm_offer.serialize()
-
-    #####################################################
-    download = CONTRACT_BLOCK_CHAIN
-    unsane_offer = BlockChain.deserialize(download)
-    print(unsane_offer)
-    unsane_offer.validate(GHASH)
-    unsane_offer.addBlock(unsane, ack=True)
-    accept_upload = unsane_offer.serialize()
-
-    ######################################################
-
-    yes_from_unsane = BlockChain.deserialize(accept_upload)
-    yes_from_unsane.validate(GHASH)
-    no_from_ftm = BlockChain.deserialize(deny_upload)
-    yes_from_unsane.validate(GHASH)
-
-    # XXX: at this point there is a merge op
-    print(yes_from_unsane)
-    print(no_from_ftm)
-
-    with open("sample.json", "w") as fp:
-        fp.write(CONTRACT_BLOCK_CHAIN)
-
-    if args.server:
-        h = {"content-type": "application/jose"}
-        new_chain = BlockChain.deserialize(CONTRACT_BLOCK_CHAIN)
-        for block in new_chain:
-            print("UPLOADING:", block)
-            resp = requests.post(args.server + "/blocks", headers=h,
-                                 data=block.serialize(),
-                                 timeout=5)
-            if resp.status_code != 201:
-                log.error(resp)
-                raise requests.RequestException(response=resp)
-
-        resp = requests.get(args.server + "/chains/" +
-                            new_chain[0].payload["sub"])
-        downloaded_chain = BlockChain.deserialize(json.dumps(resp.json()))
-        downloaded_chain.validate(new_chain[0].hash)
-
-
 argparse_opts = {"epilog": EPILOG,
                  "formatter_class": RawDescriptionHelpFormatter,
                 }
 app = Application(main, name="clique", version=__version__,
                   extra_arg_parser_opts=argparse_opts)
 app.arg_parser.add_argument("--server", metavar="URL",
                             help="URL of remote key server.")
-# blockchain
-"""
-#blockchain_parser = sub_parser.add_parser("blockchain",
-#                                          help="Read blockchains.")
-#blockchain_parser.add_argument("chainfile", metavar="FILE",
-#        type=FileType('r'),
-#        help="File containing serialized block chain.")
-#blockchain_parser.set_defaults(func=blockchain)
-#
-#contract_parser = sub_parser.add_parser("contract_example", help="Toy")
-#contract_parser.set_defaults(func=contract_example)
-"""
 app.enableCommands(title="Subcommands", dest="subcmd")
 
 if __name__ == "__main__":  # pragma: nocover

clique/__main__.py

@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import sys
-from nose.tools import *
+from nose.tools import assert_equals, assert_dict_equal
 
 from jwcrypto.jwk import JWK
 from clique.authchain import Grant
 from clique import Identity, IdentityChain, AuthChain, keystore, chainstore
-from clique import useCliqueServer
+from clique import useCliqueServer  # noqa
 
 
 def main():
-    #useCliqueServer("https://outer-planes.net/clique")
+    #useCliqueServer("https://outer-planes.net/clique")   # noqa
 
     for id in global_identities:
         keystore().add(id.key)
@@ -144,7 +144,7 @@ def authchain():
 
 
 alice = Identity("acct:[email protected]",
-                 JWK(**{#"cmt": "alice",
+                 JWK(**{#"cmt": "alice",  # noqa
                         "crv": "P-256",
                         "d": "z-CuqNSEkOyoXWlGcoqgaq_nh6WlgtcV8ZroeNQ5AS0",
                         "kid": "ZansZqsUXsTucfJC6t3ApBXAsXfR4spy4MmFOHek5Qc",
@@ -154,7 +154,7 @@ def authchain():
                         "y": "xkJVvFpTuTXou0xkXpiVlsldjH10Qj5831ZJbrFHNPQ"
                    }))
 bob = Identity("acct:[email protected]",
-               JWK(**{#"cmt": "bob",
+               JWK(**{#"cmt": "bob",  # noqa
                       "crv": "P-256",
                       "d": "fgug1klBZUQr83wVDVwLj9odTOwfTQ9wbTw2rMZyhJQ",
                       "kid": "SETKquASXDG0k5ERRAa4kvXNAGGWfkZxvfEOxks9tHU",
@@ -164,7 +164,7 @@ def authchain():
                       "y": "CCnBEEsnzAMU0YbyFRrDPuHoDHGD6mt54RwWtLH8e3E"
                  }))
 jack = Identity("acct:[email protected]",
-                JWK(**{#"cmt": "jack",
+                JWK(**{#"cmt": "jack",  # noqa
                        "crv": "P-256",
                        "d": "0FYEyIkPZT3xAKh226266nqUg5e9NWl88-TFn0pLcmY",
                        "kid": "OsY_R82yHLKXxVVZl-f5aBaqpN4yH9wSyeLwxTy_8Lo",
@@ -174,7 +174,7 @@ def authchain():
                        "y": "5digz6ao89Kw9p50VRk9P0SbbKwrqwQdBMqoKhjTCu8"
                       }))
 diane = Identity("acct:[email protected]",
-                 JWK(**{#"cmt": "diane",
+                 JWK(**{#"cmt": "diane",  # noqa
                         "crv": "P-256",
                         "d": "xqoqU02XMyVQfTYEwLDt1kNGM9IOqvfrbMk-K-c_thM",
                         "kid": "2PgeWCJIN2Btmp_FcfIqephBFAYmJ8Gp0v1XZ0Gm-c8",
@@ -184,7 +184,7 @@ def authchain():
                         "y": "2i4A23HuPwY7yu_p9-sb3xM9uGQkBD7jxOJ20Vx1mzY"
                        }))
 steve = Identity("acct:[email protected]",
-                 JWK(**{#"cmt": "steve",
+                 JWK(**{#"cmt": "steve",  # noqa
                         "crv": "P-256",
                         "d": "5yOV5PUmopGZUEZ1QJcnwvb8dMQaBv275h87QaK1U3o",
                         "kid": "NP7aCbQTrZEKFfnNYxU1mPgDdYLokQt13cpFAEE7zAk",
@@ -199,4 +199,3 @@ def authchain():
 
 if __name__ == "__main__":
     sys.exit(main() or 0)
-