From e5489c95d27220e56de6524383c19dd714236d99 Mon Sep 17 00:00:00 2001 From: Sangat Das Date: Tue, 18 Jan 2022 16:30:00 +0000 Subject: [PATCH] 1 test failed but should be minor issue --- docs/root/source/conf.py | 2 +- .../cross-project-policies/code-of-conduct.md | 2 +- .../cross-project-policies/python-style-guide.md | 6 +++--- .../cross-project-policies/release-process.md | 10 +++++----- .../api/http-samples/api-index-response.http | 2 +- .../api/http-samples/get-block-response.http | 4 ++-- .../api/http-samples/get-block-txid-request.http | 2 +- .../http-samples/get-tx-by-asset-request.http | 2 +- .../http-samples/get-tx-by-asset-response.http | 16 ++++++++-------- .../api/http-samples/get-tx-id-request.http | 2 +- .../api/http-samples/get-tx-id-response.http | 4 ++-- .../api/http-samples/index-response.http | 6 +++--- .../api/http-samples/post-tx-request.http | 4 ++-- .../api/http-samples/post-tx-response.http | 4 ++-- tests/web/test_websocket_server.py | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/docs/root/source/conf.py b/docs/root/source/conf.py index 19ced6f..24728ee 100644 --- a/docs/root/source/conf.py +++ b/docs/root/source/conf.py @@ -33,7 +33,7 @@ from recommonmark.parser import CommonMarkParser # get version _version = {} -with open('../../../bigchaindb/version.py') as fp: +with open('../../../planetmint/version.py') as fp: exec(fp.read(), _version) diff --git a/docs/root/source/contributing/cross-project-policies/code-of-conduct.md b/docs/root/source/contributing/cross-project-policies/code-of-conduct.md index bca9eab..4dff95c 100644 --- a/docs/root/source/contributing/cross-project-policies/code-of-conduct.md +++ b/docs/root/source/contributing/cross-project-policies/code-of-conduct.md @@ -1,6 +1,6 @@ diff --git a/docs/root/source/contributing/cross-project-policies/python-style-guide.md b/docs/root/source/contributing/cross-project-policies/python-style-guide.md index b84b40b..5cdb39b 100644 --- a/docs/root/source/contributing/cross-project-policies/python-style-guide.md +++ b/docs/root/source/contributing/cross-project-policies/python-style-guide.md @@ -1,6 +1,6 @@ @@ -13,7 +13,7 @@ This guide starts out with our general Python coding style guidelines and ends w Our starting point is [PEP8](https://www.python.org/dev/peps/pep-0008/), the standard "Style Guide for Python Code." Many Python IDEs will check your code against PEP8. (Note that PEP8 isn't frozen; it actually changes over time, but slowly.) -Planetmint uses Python 3.5+, so you can ignore all PEP8 guidelines specific to Python 2. +BigchainDB uses Python 3.5+, so you can ignore all PEP8 guidelines specific to Python 2. We use [pre-commit](http://pre-commit.com/) to check some of the rules below before every commit but not everything is realized yet. The hooks we use can be found in the [.pre-commit-config.yaml](https://github.com/bigchaindb/bigchaindb/blob/master/.pre-commit-config.yaml) file. @@ -30,7 +30,7 @@ PEP8 says some things about docstrings, but not what to put in them or how to st PEP8 has some [maximum line length guidelines](https://www.python.org/dev/peps/pep-0008/#id17), starting with "Limit all lines to a maximum of 79 characters" but "for flowing long blocks of text with fewer structural restrictions (docstrings or comments), the line length should be limited to 72 characters." -We discussed this at length, and it seems that the consensus is: _try_ to keep line lengths less than 79/72 characters, unless you have a special situation where longer lines would improve readability. (The basic reason is that 79/72 works for everyone, and Planetmint is an open source project.) As a hard limit, keep all lines less than 119 characters (which is the width of GitHub code review). +We discussed this at length, and it seems that the consensus is: _try_ to keep line lengths less than 79/72 characters, unless you have a special situation where longer lines would improve readability. (The basic reason is that 79/72 works for everyone, and BigchainDB is an open source project.) As a hard limit, keep all lines less than 119 characters (which is the width of GitHub code review). ### Single or Double Quotes? diff --git a/docs/root/source/contributing/cross-project-policies/release-process.md b/docs/root/source/contributing/cross-project-policies/release-process.md index 117e407..84e1924 100644 --- a/docs/root/source/contributing/cross-project-policies/release-process.md +++ b/docs/root/source/contributing/cross-project-policies/release-process.md @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ Code is Apache-2.0 and docs are CC-BY-4.0 ## Notes -Planetmint follows +BigchainDB follows [the Python form of Semantic Versioning](https://packaging.python.org/tutorials/distributing-packages/#choosing-a-versioning-scheme) (i.e. MAJOR.MINOR.PATCH), which is almost identical @@ -46,7 +46,7 @@ The following steps are what we do to release a new version of _BigchainDB Serve - In `bigchaindb/version.py`: - update `__version__` to e.g. `0.9.0` (with no `.dev` on the end) - update `__short_version__` to e.g. `0.9` (with no `.dev` on the end) - - In the docs about installing Planetmint (and Tendermint), and in the associated scripts, recommend/install a version of Tendermint that _actually works_ with the soon-to-be-released version of Planetmint. You can find all such references by doing a search for the previously-recommended version number, such as `0.31.5`. + - In the docs about installing BigchainDB (and Tendermint), and in the associated scripts, recommend/install a version of Tendermint that _actually works_ with the soon-to-be-released version of BigchainDB. You can find all such references by doing a search for the previously-recommended version number, such as `0.31.5`. - In `setup.py`, _maybe_ update the development status item in the `classifiers` list. For example, one allowed value is `"Development Status :: 5 - Production/Stable"`. The [allowed values are listed at pypi.python.org](https://pypi.python.org/pypi?%3Aaction=list_classifiers). 2. **Wait for all the tests to pass!** @@ -65,7 +65,7 @@ The following steps are what we do to release a new version of _BigchainDB Serve ```text sudo chown -R $(whoami):$(whoami) . ``` -10. [Log in to readthedocs.org](https://readthedocs.org/accounts/login/) and go to the **Planetmint Server** project, then: +10. [Log in to readthedocs.org](https://readthedocs.org/accounts/login/) and go to the **BigchainDB Server** project, then: - Click on "Builds", select "latest" from the drop-down menu, then click the "Build Version:" button. - Wait for the build of "latest" to finish. This can take a few minutes. - Go to Admin --> Advanced Settings @@ -98,4 +98,4 @@ The following steps are what we do to release a new version of _BigchainDB Serve - If the release is an Alpha, Beta or Release Candidate release, then click on the "Trigger" button for that tag as well. -Congratulations, you have released a new version of Planetmint Server! +Congratulations, you have released a new version of BigchainDB Server! diff --git a/docs/root/source/installation/api/http-samples/api-index-response.http b/docs/root/source/installation/api/http-samples/api-index-response.http index f425f83..376552b 100644 --- a/docs/root/source/installation/api/http-samples/api-index-response.http +++ b/docs/root/source/installation/api/http-samples/api-index-response.http @@ -4,7 +4,7 @@ Content-Type: application/json { "assets": "/assets/", "blocks": "/blocks/", - "docs": "https://docs.bigchaindb.com/projects/server/en/v2.2.2/http-client-server-api.html", + "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html", "metadata": "/metadata/", "outputs": "/outputs/", "streams": "ws://localhost:9985/api/v1/streams/valid_transactions", diff --git a/docs/root/source/installation/api/http-samples/get-block-response.http b/docs/root/source/installation/api/http-samples/get-block-response.http index b517f7d..168c60c 100644 --- a/docs/root/source/installation/api/http-samples/get-block-response.http +++ b/docs/root/source/installation/api/http-samples/get-block-response.http @@ -10,10 +10,10 @@ Content-Type: application/json "msg": "Hello Planetmint!" } }, - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317", + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2", "inputs": [ { - "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUCy4BR6gKaYT-tdyAGPPpknIqI4JYQQ-p2nCg3_9BfOI-15vzldhyz-j_LZVpqAlRmbTzKS-Q5gs7ZIFaZCA_UD", + "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUBcdRj6EnG3MPl47m3XPd1HNfe7q3WL4T6MewNNnat33UvzVnPHo_vossv57M7L064VwrYMLGp097H7IeHpDngK", "fulfills": null, "owners_before": [ "4K9sWUMFwTgaDGPfdynrbxWqWS6sWmKbZoTjxLtVUibD" diff --git a/docs/root/source/installation/api/http-samples/get-block-txid-request.http b/docs/root/source/installation/api/http-samples/get-block-txid-request.http index 1f17c6b..7ecb018 100644 --- a/docs/root/source/installation/api/http-samples/get-block-txid-request.http +++ b/docs/root/source/installation/api/http-samples/get-block-txid-request.http @@ -1,3 +1,3 @@ -GET /api/v1/blocks?transaction_id=4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317 HTTP/1.1 +GET /api/v1/blocks?transaction_id=6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2 HTTP/1.1 Host: example.com diff --git a/docs/root/source/installation/api/http-samples/get-tx-by-asset-request.http b/docs/root/source/installation/api/http-samples/get-tx-by-asset-request.http index a5c8f3f..fb15c84 100644 --- a/docs/root/source/installation/api/http-samples/get-tx-by-asset-request.http +++ b/docs/root/source/installation/api/http-samples/get-tx-by-asset-request.http @@ -1,3 +1,3 @@ -GET /api/v1/transactions?operation=TRANSFER&asset_id=4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317 HTTP/1.1 +GET /api/v1/transactions?operation=TRANSFER&asset_id=6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2 HTTP/1.1 Host: example.com diff --git a/docs/root/source/installation/api/http-samples/get-tx-by-asset-response.http b/docs/root/source/installation/api/http-samples/get-tx-by-asset-response.http index 63f9912..6ed97dc 100644 --- a/docs/root/source/installation/api/http-samples/get-tx-by-asset-response.http +++ b/docs/root/source/installation/api/http-samples/get-tx-by-asset-response.http @@ -3,15 +3,15 @@ Content-Type: application/json [{ "asset": { - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317" + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2" }, - "id": "79ef6803210c941903d63d08b40fa17f0a5a04f11ac0ff04451553a187d97a30", + "id": "2bf8ae1e3bc889a26df129dd6bbe6ccab30d1ae8e9e434fae1c4446042a68931", "inputs": [ { - "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUAYRI8kzKaZcrW-_avQrAIk5q-7o_7U6biBvoHk1ioBLqHSBcE_PAdNEaeWesAAW_HeCqNUWKaJ5Lzo5Nfz7QgN", + "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUA90mMa9AWnbI70CUSVgzV9kRFf3tQ20RUIczNFqmwg9xrpOk_5uNoJB4bWRIojZmUhEyxSueCHLpqPXCEuyisE", "fulfills": { "output_index": 0, - "transaction_id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317" + "transaction_id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2" }, "owners_before": [ "4K9sWUMFwTgaDGPfdynrbxWqWS6sWmKbZoTjxLtVUibD" @@ -41,15 +41,15 @@ Content-Type: application/json }, { "asset": { - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317" + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2" }, - "id": "1fec726a3b426498147f1a1f19a92c187d551a7f66db4b88d666d7dcc10e86a4", + "id": "b9b614175eaed7cc93d9b80ebc2a91d35ae31928a7c218ae982272bb1785ef16", "inputs": [ { - "fulfillment": "pGSAICw7Ul-c2lG6NFbHp3FbKRC7fivQcNGO7GS4wV3A-1QggUARCMty2JBK_OyPJntWEFxDG4-VbKMy853NtqwnPib5QUJIuwPQa1Y4aN2iIBuoqGE85Pmjcc1ScG9FCPSQHacK", + "fulfillment": "pGSAICw7Ul-c2lG6NFbHp3FbKRC7fivQcNGO7GS4wV3A-1QggUDi2bAVKJgEyE3LzMrAnAu1PnNs9DbDNkABaY6j3OCNEVwNVNg3V3qELOFNnH8vGUevREr4E-8Vb1Kzk4VR71MO", "fulfills": { "output_index": 0, - "transaction_id": "79ef6803210c941903d63d08b40fa17f0a5a04f11ac0ff04451553a187d97a30" + "transaction_id": "2bf8ae1e3bc889a26df129dd6bbe6ccab30d1ae8e9e434fae1c4446042a68931" }, "owners_before": [ "3yfQPHeWAa1MxTX9Zf9176QqcpcnWcanVZZbaHb8B3h9" diff --git a/docs/root/source/installation/api/http-samples/get-tx-id-request.http b/docs/root/source/installation/api/http-samples/get-tx-id-request.http index 87bd123..c6c834c 100644 --- a/docs/root/source/installation/api/http-samples/get-tx-id-request.http +++ b/docs/root/source/installation/api/http-samples/get-tx-id-request.http @@ -1,3 +1,3 @@ -GET /api/v1/transactions/4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317 HTTP/1.1 +GET /api/v1/transactions/6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2 HTTP/1.1 Host: example.com diff --git a/docs/root/source/installation/api/http-samples/get-tx-id-response.http b/docs/root/source/installation/api/http-samples/get-tx-id-response.http index 687aa33..c5f3b71 100644 --- a/docs/root/source/installation/api/http-samples/get-tx-id-response.http +++ b/docs/root/source/installation/api/http-samples/get-tx-id-response.http @@ -7,10 +7,10 @@ Content-Type: application/json "msg": "Hello Planetmint!" } }, - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317", + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2", "inputs": [ { - "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUCy4BR6gKaYT-tdyAGPPpknIqI4JYQQ-p2nCg3_9BfOI-15vzldhyz-j_LZVpqAlRmbTzKS-Q5gs7ZIFaZCA_UD", + "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUBcdRj6EnG3MPl47m3XPd1HNfe7q3WL4T6MewNNnat33UvzVnPHo_vossv57M7L064VwrYMLGp097H7IeHpDngK", "fulfills": null, "owners_before": [ "4K9sWUMFwTgaDGPfdynrbxWqWS6sWmKbZoTjxLtVUibD" diff --git a/docs/root/source/installation/api/http-samples/index-response.http b/docs/root/source/installation/api/http-samples/index-response.http index 0825b18..c087059 100644 --- a/docs/root/source/installation/api/http-samples/index-response.http +++ b/docs/root/source/installation/api/http-samples/index-response.http @@ -6,7 +6,7 @@ Content-Type: application/json "v1": { "assets": "/api/v1/assets/", "blocks": "/api/v1/blocks/", - "docs": "https://docs.bigchaindb.com/projects/server/en/v2.2.2/http-client-server-api.html", + "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/http-client-server-api.html", "metadata": "/api/v1/metadata/", "outputs": "/api/v1/outputs/", "streams": "ws://localhost:9985/api/v1/streams/valid_transactions", @@ -14,7 +14,7 @@ Content-Type: application/json "validators": "/api/v1/validators" } }, - "docs": "https://docs.bigchaindb.com/projects/server/en/v2.2.2/", + "docs": "https://docs.bigchaindb.com/projects/server/en/v0.9.0/", "software": "Planetmint", - "version": "2.2.2" + "version": "0.9.0" } diff --git a/docs/root/source/installation/api/http-samples/post-tx-request.http b/docs/root/source/installation/api/http-samples/post-tx-request.http index 53b0ae0..8ab0710 100644 --- a/docs/root/source/installation/api/http-samples/post-tx-request.http +++ b/docs/root/source/installation/api/http-samples/post-tx-request.http @@ -8,10 +8,10 @@ Content-Type: application/json "msg": "Hello Planetmint!" } }, - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317", + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2", "inputs": [ { - "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUCy4BR6gKaYT-tdyAGPPpknIqI4JYQQ-p2nCg3_9BfOI-15vzldhyz-j_LZVpqAlRmbTzKS-Q5gs7ZIFaZCA_UD", + "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUBcdRj6EnG3MPl47m3XPd1HNfe7q3WL4T6MewNNnat33UvzVnPHo_vossv57M7L064VwrYMLGp097H7IeHpDngK", "fulfills": null, "owners_before": [ "4K9sWUMFwTgaDGPfdynrbxWqWS6sWmKbZoTjxLtVUibD" diff --git a/docs/root/source/installation/api/http-samples/post-tx-response.http b/docs/root/source/installation/api/http-samples/post-tx-response.http index ed60767..653014e 100644 --- a/docs/root/source/installation/api/http-samples/post-tx-response.http +++ b/docs/root/source/installation/api/http-samples/post-tx-response.http @@ -7,10 +7,10 @@ Content-Type: application/json "msg": "Hello Planetmint!" } }, - "id": "4957744b3ac54434b8270f2c854cc1040228c82ea4e72d66d2887a4d3e30b317", + "id": "6438c733f53dff60bdeded80e8c95126dd3a7ce8c1ee5d5591d030e61cde35d2", "inputs": [ { - "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUCy4BR6gKaYT-tdyAGPPpknIqI4JYQQ-p2nCg3_9BfOI-15vzldhyz-j_LZVpqAlRmbTzKS-Q5gs7ZIFaZCA_UD", + "fulfillment": "pGSAIDE5i63cn4X8T8N1sZ2mGkJD5lNRnBM4PZgI_zvzbr-cgUBcdRj6EnG3MPl47m3XPd1HNfe7q3WL4T6MewNNnat33UvzVnPHo_vossv57M7L064VwrYMLGp097H7IeHpDngK", "fulfills": null, "owners_before": [ "4K9sWUMFwTgaDGPfdynrbxWqWS6sWmKbZoTjxLtVUibD" diff --git a/tests/web/test_websocket_server.py b/tests/web/test_websocket_server.py index fc164d5..17c00e2 100644 --- a/tests/web/test_websocket_server.py +++ b/tests/web/test_websocket_server.py @@ -85,7 +85,7 @@ async def test_bridge_sync_async_queue(loop): @patch('threading.Thread') @patch('aiohttp.web.run_app') -@patch('bigchaindb.web.websocket_server.init_app') +@patch('planetmint.web.websocket_server.init_app') @patch('asyncio.get_event_loop', return_value='event-loop') @patch('asyncio.Queue', return_value='event-queue') def test_start_creates_an_event_loop(queue_mock, get_event_loop_mock,