Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into public-validation-functions

Browse Source
This commit is contained in:
Matt Smith 2016-03-19 00:10:56 -07:00
commit a44a5703d1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigchaindb/config_utils.py
View File

@ -117,7 +117,7 @@ def load_consensus_plugin(name=None):
if not name: if not name:
name = bigchaindb.config.get('consensus_plugin', 'default') name = bigchaindb.config.get('consensus_plugin', 'default')
# TODO: This will return the first plugin with group `bigchaindb.plugins` # TODO: This will return the first plugin with group `bigchaindb.consensus`
# and name `name` in the active WorkingSet. # and name `name` in the active WorkingSet.
# We should probably support Requirements specs in the config, e.g. # We should probably support Requirements specs in the config, e.g.
# consensus_plugin: 'my-plugin-package==0.0.1;default' # consensus_plugin: 'my-plugin-package==0.0.1;default'
@ -128,7 +128,7 @@ def load_consensus_plugin(name=None):
# No matching entry_point found # No matching entry_point found
if not plugin: if not plugin:
raise ResolutionError( raise ResolutionError(
'No plugin found in group `bigchaindb.plugins` with name `{}`'. 'No plugin found in group `bigchaindb.consensus` with name `{}`'.
format(name)) format(name))
# Is this strictness desireable? # Is this strictness desireable?

4
bigchaindb/consensus.py
View File

@ -41,7 +41,7 @@ class AbstractConsensusRules(metaclass=ABCMeta):
block (dict): block to validate. block (dict): block to validate.
Returns: Returns:
The block if the block is valid else it raises and exception The block if the block is valid else it raises an exception
describing the reason why the block is invalid. describing the reason why the block is invalid.
Raises: Raises:
@ -177,7 +177,7 @@ class BaseConsensusRules(AbstractConsensusRules):
block (dict): block to validate. block (dict): block to validate.
Returns: Returns:
The block if the block is valid else it raises and exception The block if the block is valid else it raises an exception
describing the reason why the block is invalid. describing the reason why the block is invalid.
Raises: Raises:

4
docs/source/introduction.md
View File

@ -1,10 +1,10 @@
# Introduction # Introduction
BigchainDB is a scalable blockchain database. You can read about its motivations, goals and high-level architecture in the [BigchainDB whitepaper](https://www.bigchaindb.com/whitepaper/). This document, the _BigchainDB Documentation_, is intended primarily for three groups of people: BigchainDB is a scalable blockchain database. You can read about its motivations, goals and high-level architecture in the [BigchainDB whitepaper](https://www.bigchaindb.com/whitepaper/). This document, the _BigchainDB Documentation_, is intended primarily for:
1. Developers of BigchainDB server software. 1. Developers of BigchainDB server software.
2. People deploying and managing BigchainDB clusters. 2. People deploying and managing BigchainDB clusters.
3. Developers of BigchainDB driver software (SDKs used to develop client software). 3. Developers of BigchainDB driver software (SDKs used to develop client software).
4. App developers who are developing client apps to talk to one or more live, operational BigchainDB clusters. They would use one of the BigchainDB drivers. 4. App developers who are developing client apps to talk to one or more live, operational BigchainDB clusters. They would use one of the BigchainDB drivers.
If you're curious about what's coming in our roadmap, see [the ROADMAP.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md) and [the list of open issues](https://github.com/bigchaindb/bigchaindb/issues). If you want to request a feature, file a bug report, or make a pull request, see [the CONTRIBUTING.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CONTRIBUTING.md). If you're curious about what's in our roadmap, see [the ROADMAP.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md) and [the list of open issues](https://github.com/bigchaindb/bigchaindb/issues). If you want to request a feature, file a bug report, or make a pull request, see [the CONTRIBUTING.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CONTRIBUTING.md).