Merge pull request #381 from bigchaindb/bigchaindb-2.0

Problem: Driver needs to be updated to support BigchainDB 2.0

Author: vrde

.ci/travis-after-success.sh

@@ -3,5 +3,5 @@
 set -e -x
 
 if [ "${TOXENV}" == "py36" ]; then
-    codecov
+    codecov -v
 fi

.ci/travis-before-install.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
 if [[ "${TOXENV}" == "py35" || "${TOXENV}" == "py36" ]]; then
-    source /etc/lsb-release
-    echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | tee -a /etc/apt/sources.list.d/rethinkdb.list
-    wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add -
-    apt-get update -qq
+  sudo apt-get update
+  sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+
+  sudo rm /usr/local/bin/docker-compose
+  curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  chmod +x docker-compose
+  sudo mv docker-compose /usr/local/bin
 fi

.ci/travis-before-script.sh

@@ -3,10 +3,5 @@
 set -e -x
 
 if [[ "${TOXENV}" == "py35" || "${TOXENV}" == "py36" ]]; then
-    rethinkdb --daemon
-    export BIGCHAINDB_KEYPAIR_PUBLIC=GW1nrdZm4mbVC8ePeiGWz6DqHexqewqy5teURVHi3RG4
-    export BIGCHAINDB_KEYPAIR_PRIVATE=2kQgBtQnHoauw8QchKM7xYvEBW1QDoHzhBsCL9Vi1AzB 
-
-    # Start BigchainDB in the background and ignore any output
-    bigchaindb start >/dev/null 2>&1 &
+    docker-compose up -d bigchaindb
 fi

.ci/travis-install.sh

@@ -6,7 +6,6 @@ pip install --upgrade pip
 pip install --upgrade tox
 
 if [[ "${TOXENV}" == "py35" || "${TOXENV}" == "py36" ]]; then
-    sudo apt-get install rethinkdb
-    pip install git+https://github.com/bigchaindb/bigchaindb.git
+    docker-compose build --no-cache bigchaindb bigchaindb-driver
     pip install --upgrade codecov
 fi

.ci/travis_script.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e -x
+
+if [[ "${TOXENV}" == "py35" || "${TOXENV}" == "py36" ]]; then
+  docker-compose run --rm bigchaindb-driver pytest -v
+else
+  tox -e ${TOXENV}
+fi

.travis.yml

@@ -4,22 +4,25 @@ python:
   - 3.6
 
 env:
-  - TOXENV=py35
-  - TOXENV=py36
-  - TOXENV=flake8
-  - TOXENV=docs
-  
+  global:
+    - DOCKER_COMPOSE_VERSION=1.19.0
+  matrix:
+    - TOXENV=py35
+    - TOXENV=py36
+    - TOXENV=flake8
+    - TOXENV=docs
+
 matrix:
   fast_finish: true
   exclude:
-  - python: 3.5
-    env: TOXENV=flake8 
-  - python: 3.5 
-    env: TOXENV=docs
-  - python: 3.5
-    env: TOXENV=py36
-  - python: 3.6
-    env: TOXENV=py35
+    - python: 3.5
+      env: TOXENV=flake8
+    - python: 3.5
+      env: TOXENV=docs
+    - python: 3.5
+      env: TOXENV=py36
+    - python: 3.6
+      env: TOXENV=py35
 
 before_install:
   - sudo .ci/travis-before-install.sh
@@ -30,7 +33,7 @@ install:
 before_script:
   - .ci/travis-before-script.sh
 
-script: tox -e ${TOXENV}
+script: .ci/travis_script.sh
 
 after_success:
   - .ci/travis-after-success.sh

CONTRIBUTING.rst

@@ -86,11 +86,11 @@ Development Environment with Docker
 Depending on what you are doing, you may need to run at least one BigchainDB
 node. You can use the `docker-compose.yml`_ file to run a node, and perform
 other tasks that depend on the running node. To run a BigchainDB node, (for
-development), you start a MongoDB node, followed by the linked BigchainDB
+development), you start a MongoDB and Tendermint  node, followed by the linked BigchainDB
 node::
 
-    $ docker-compose up -d db
-    $ docker-compose up -d bdb-server
+    # Implicitly creates a MongoDB and Tendermint instance
+    $ docker-compose up -d bigchaindb
 
 You can monitor the logs::
 
@@ -102,44 +102,22 @@ Tests
 
 To run a subset of tests::
 
-    $ docker-compose run --rm bdb pytest -v tests/test_driver.py
+    $ docker-compose run --rm bigchaindb-driver pytest -v tests/test_driver.py
 
 .. important:: When running tests, unless you are targeting a test that does
     not require a connection with the BigchainDB server, you need to run the
-    BigchainDB and MongoDB servers::
+    BigchainDB, MongoDB and Tendermint servers::
 
-    $ docker-compose up -d db
-    $ docker-compose up -d bdb-server
-
-
-Using RethinkDB as the backend
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The default docker-compose file runs MongoDB as a backend. In order to work
-with RethinkDB, one has to use the ``docker-compose.rdb.yml`` file, which
-implies working with `multiple compose files`_. The workflow is the same as
-with MongoDB.
-
-First start RethinkDB::
-
-    $ docker-compose -f docker-compose.rdb.yml up -d db
-
-then one BigchainDB server node::
-
-    $ docker-compose -f docker-compose.rdb.yml up -d bdb-server
-
-and run the tests::
-
-    $ docker-compose -f docker-compose.rdb.yml run --rm bdb pytest -v
+    $ docker-compose up -d bigchaindb
 
 
 Dependency on Bigchaindb
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-By default, the development requirements, `BigchainDB server Dockerfile <https://github.com/bigchaindb/bigchaindb-driver/blob/master/compose/server/Dockerfile>`_,
+By default, the development requirements, `BigchainDB server Dockerfile <https://github.com/bigchaindb/bigchaindb-driver/blob/master/compose/bigchaindb_server/Dockerfile>`_,
 and `.travis.yml <https://github.com/bigchaindb/bigchaindb-driver/blob/master/.travis.yml>`_
 are set to depend from BigchainDB's master branch to more easily track changes
 against BigchainDB's API.
 
 
 .. _docker-compose.yml: https://github.com/bigchaindb/bigchaindb-driver/blob/master/docker-compose.yml
-.. _multiple compose files: https://docs.docker.com/compose/extends/#multiple-compose-files

README.rst

@@ -30,7 +30,6 @@ Features
 * Support for preparing, fulfilling, and sending transactions to a BigchainDB
   node.
 * Retrieval of transactions by id.
-* Getting status of a transaction by id.
 
 Install
 ----------

bigchaindb_driver/driver.py

@@ -304,7 +304,7 @@ def get(self, *, asset_id, operation=None, headers=None):
             headers=headers,
         )
 
-    def send(self, transaction, headers=None):
+    def send(self, transaction, mode='async', headers=None):
         """Submit a transaction to the Federation.
 
         Args:
@@ -317,7 +317,11 @@ def send(self, transaction, headers=None):
 
         """
         return self.transport.forward_request(
-            method='POST', path=self.path, json=transaction, headers=headers)
+            method='POST',
+            path=self.path,
+            json=transaction,
+            params={'mode': mode},
+            headers=headers)
 
     def retrieve(self, txid, headers=None):
         """Retrieves the transaction with the given id.
@@ -334,25 +338,6 @@ def retrieve(self, txid, headers=None):
         return self.transport.forward_request(
             method='GET', path=path, headers=None)
 
-    def status(self, txid, headers=None):
-        """Retrieves the status of the transaction with the given id.
-
-        Args:
-            txid (str): Id of the transaction to retrieve the status for.
-            headers (dict): Optional headers to pass to the request.
-
-        Returns:
-            dict: A dict containing a 'status' item for the transaction.
-
-        """
-        # TODO Once the HTTP API has stabilized, especially with matters
-        # relating to the transaction status, this can be updated to match the
-        # HTTP API more thoroughly.
-        path = self.api_prefix + '/statuses'
-        return self.transport.forward_request(
-            method='GET', path=path, params={'transaction_id': txid},
-            headers=headers)
-
 
 class OutputsEndpoint(NamespacedDriver):
     """Exposes functionality of the ``'/outputs'`` endpoint.
@@ -409,39 +394,38 @@ class BlocksEndpoint(NamespacedDriver):
 
     PATH = '/blocks/'
 
-    def get(self, *, txid, status=None, headers=None):
-        """Get the block(s) that contain the given transaction id
-        (``txid``), and optionally that have the given ``status``.
+    def get(self, *, txid, headers=None):
+        """Get the block that contains the given transaction id (``txid``)
+           else return ``None``
 
         Args:
             txid (str): Transaction id.
-            status (str): Status the block should have. Accepted values
-                are ``VALID``, ``UNDECIDED`` or ``INVALID``.
             headers (dict): Optional headers to pass to the request.
 
         Returns:
-            :obj:`list` of :obj:`str`: List of block ids.
+            :obj:`list` of :obj:`int`: List of block heights.
 
         """
-        return self.transport.forward_request(
+        block_list = self.transport.forward_request(
             method='GET',
             path=self.path,
-            params={'transaction_id': txid, 'status': status},
+            params={'transaction_id': txid},
             headers=headers,
         )
+        return block_list[0] if len(block_list) else None
 
-    def retrieve(self, block_id, headers=None):
+    def retrieve(self, block_height, headers=None):
         """Retrieves the transaction with the given id.
 
         Args:
-            block_id (str): Id of the block to retrieve.
+            block_height (str): height of the block to retrieve.
             headers (dict): Optional headers to pass to the request.
 
         Returns:
             dict: The block with the given id.
 
         """
-        path = self.path + block_id
+        path = self.path + block_height
         return self.transport.forward_request(
             method='GET', path=path, headers=None)
 

bigchaindb_driver/offchain.py

@@ -252,7 +252,7 @@ def prepare_transfer_transaction(*,
                                                         'type': 'ed25519-sha-256'},
                                             'uri': 'ni:///sha-256;7ApQLsLLQgj5WOUipJg1txojmge68pctwFxvc3iOl54?fpt=ed25519-sha-256&cost=131072'},
                               'public_keys': ['3Cxh1eKZk3Wp9KGBWFS7iVde465UvqUKnEqTg2MW4wNf']}],
-                 'version': '1.0'}
+                 'version': '2.0'}
 
         Then, the input may be constructed in this way::