From 52d30b487032b3c975d0e14d5c891df77655b3ad Mon Sep 17 00:00:00 2001
From: Mike Hearn
Date: Wed, 27 Jan 2016 15:01:52 +0000
Subject: [PATCH] Regen docsite.
---
docs/build/html/_sources/codestyle.txt | 162 ++++++++
docs/build/html/_sources/index.txt | 1 +
.../html/_sources/protocol-state-machines.txt | 4 +-
docs/build/html/_static/basic.css | 2 +-
docs/build/html/_static/doctools.js | 2 +-
docs/build/html/_static/pygments.css | 2 +
docs/build/html/_static/searchtools.js | 47 ++-
docs/build/html/_static/websupport.js | 2 +-
docs/build/html/codestyle.html | 355 ++++++++++++++++++
docs/build/html/data-model.html | 1 +
docs/build/html/genindex.html | 1 +
docs/build/html/getting-set-up.html | 1 +
docs/build/html/index.html | 8 +
docs/build/html/inthebox.html | 1 +
docs/build/html/messaging.html | 1 +
docs/build/html/protocol-state-machines.html | 5 +-
docs/build/html/roadmap.html | 4 +
docs/build/html/search.html | 1 +
docs/build/html/searchindex.js | 2 +-
docs/build/html/tutorial.html | 5 +-
docs/build/html/visualiser.html | 1 +
21 files changed, 589 insertions(+), 19 deletions(-)
create mode 100644 docs/build/html/_sources/codestyle.txt
create mode 100644 docs/build/html/codestyle.html
diff --git a/docs/build/html/_sources/codestyle.txt b/docs/build/html/_sources/codestyle.txt
new file mode 100644
index 0000000000..8b19baec46
--- /dev/null
+++ b/docs/build/html/_sources/codestyle.txt
@@ -0,0 +1,162 @@
+Code style guide
+================
+
+This document explains the coding style used in the R3 prototyping repository. You will be expected to follow these
+recommendations when submitting patches for review. Please take the time to read them and internalise them, to save
+time during code review.
+
+What follows are *recommendations* and not *rules*. They are in places intentionally vague, so use your good judgement
+when interpreting them.
+
+.. note:: Parts of the codebase may not follow this style guide yet. If you see a place that doesn't, please fix it!
+
+1. General style
+################
+
+We use the standard Java coding style from Sun, adapted for Kotlin in ways that should be fairly intuitive.
+
+We aim for line widths of no more than 120 characters. That is wide enough to avoid lots of pointless wrapping but
+narrow enough that with a widescreen monitor and a 12 point fixed width font (like Menlo) you can fit two files
+next to each other. This is not a rigidly enforced rule and if wrapping a line would be excessively awkward, let it
+overflow. Overflow of a few characters here and there isn't a big deal: the goal is general convenience.
+
+Code is vertically dense, blank lines in methods are used sparingly. This is so more code can fit on screen at once.
+
+Each file has a copyright notice at the top. Copy it from the existing files if you create a new one. We do not mark
+classes with @author Javadoc annotations.
+
+In Kotlin code, KDoc is used rather than JavaDoc. It's very similar except it uses Markdown for formatting instead
+of HTML tags.
+
+We target Java 8 and use the latest Java APIs whenever convenient. We use ``java.time.Instant`` to represent timestamps
+and ``java.nio.file.Path`` to represent file paths.
+
+We use spaces and not tabs.
+
+Never apply any design pattern religiously. There are no silver bullets in programming and if something is fashionable,
+that doesn't mean it's always better. In particular:
+
+* Use functional programming patterns like map, filter, fold only where it's genuinely more convenient. Never be afraid
+ to use a simple imperative construct like a for loop or a mutable counter if that results in more direct, English-like
+ code.
+* Use immutability when you don't anticipate very rapid or complex changes to the content. Immutability can help avoid
+ bugs, but over-used it can make code that has to adjust fields of an immutable object (in a clone) hard to read and
+ stress the garbage collector. When such code becomes a widespread pattern it can lead to code that is just generically
+ slow but without hotspots.
+* The tradeoffs between various thread safety techniques are complex, subtle, and no technique is always superior to
+ the others. Our code uses a mix of locks, worker threads and messaging depending on the situation.
+
+2. Comments
+###########
+
+We like them as long as they add detail that is missing from the code. Comments that simply repeat the story already
+told by the code are best deleted. Comments should:
+
+* Explain what the code is doing at a higher level than is obtainable from just examining the statement and
+ surrounding code.
+* Explain why certain choices were made and the tradeoffs considered.
+* Explain how things can go wrong, which is a detail often not easily seen just by reading the code.
+* Use good grammar with capital letters and full stops. This gets us in the right frame of mind for writing real
+ explanations of things.
+
+When writing code, imagine that you have an intelligent colleague looking over your shoulder asking you questions
+as you go. Think about what they might ask, and then put your answers in the code.
+
+Don’t be afraid of redundancy, many people will start reading your code in the middle with little or no idea of what
+it’s about, eg, due to a bug or a need to introduce a new feature. It’s OK to repeat basic facts or descriptions in
+different places if that increases the chance developers will see something important.
+
+API docs: all public methods, constants and classes should have doc comments in either JavaDoc or KDoc. API docs should:
+
+* Explain what the method does in words different to how the code describes it.
+* Always have some text, annotation-only JavaDocs don’t render well. Write “Returns a blah blah blah” rather
+ than “@returns blah blah blah” if that's the only content (or leave it out if you have nothing more to say than the
+ code already says).
+* Illustrate with examples when you might want to use the method or class. Point the user at alternatives if this code
+ is not always right.
+* Make good use of {@link} annotations.
+
+Bad JavaDocs look like this:
+
+.. sourcecode:: java
+
+ /** @return the size of the Bloom filter. */
+ public int getBloomFilterSize() {
+ return block;
+ }
+
+Good JavaDocs look like this:
+
+.. sourcecode:: java
+
+ /**
+ * Returns the size of the current {@link BloomFilter} in bytes. Larger filters have
+ * lower false positive rates for the same number of inserted keys and thus lower privacy,
+ * but bandwidth usage is also correspondingly reduced.
+ */
+ public int getBloomFilterSize() { ... }
+
+We use C-style (``/** */``) comments for API docs and we use C++ style comments (``//``) for explanations that are
+only intended to be viewed by people who read the code.
+
+3. Threading
+############
+
+Classes that are thread safe should be annotated with the ``@ThreadSafe`` annotation. The class or method comments
+should describe how threads are expected to interact with your code, unless it's obvious because the class is
+(for example) a simple immutable data holder.
+
+Code that supports callbacks or event listeners should always accept an ``Executor`` argument that defaults to
+``MoreExecutors.directThreadExecutor()`` (i.e. the calling thread) when registering the callback. This makes it easy
+to integrate the callbacks with whatever threading environment the calling code expects, e.g. serialised onto a single
+worker thread if necessary, or run directly on the background threads used by the class if the callback is thread safe
+and doesn't care in what context it's invoked.
+
+In the prototyping code it's OK to use synchronised methods i.e. with an exposed lock when the use of locking is quite
+trivial. If the synchronisation in your code is getting more complex, consider the following:
+
+1. Is the complexity necessary? At this early stage, don't worry too much about performance or scalability, as we're
+ exploring the design space rather than making an optimal implementation of a design that's already nailed down.
+2. Could you simplify it by making the data be owned by a dedicated, encapsulated worker thread? If so, remember to
+ think about flow control and what happens if a work queue fills up: the actor model can often be useful but be aware
+ of the downsides and try to avoid explicitly defining messages, prefer to send closures onto the worker thread
+ instead.
+3. If you use an explicit lock and the locking gets complex, and *always* if the class supports callbacks, use the
+ cycle detecting locks from the Guava library.
+4. Can you simplify some things by using thread-safe collections like ``CopyOnWriteArrayList`` or ``ConcurrentHashMap``?
+ These data structures are more expensive than their non-thread-safe equivalents but can be worth it if it lets us
+ simplify the code.
+
+Immutable data structures can be very useful for making it easier to reason about multi-threaded code. Kotlin makes it
+easy to define these via the "data" attribute, which auto-generates a copy() method. That lets you create clones of
+an immutable object with arbitrary fields adjusted in the clone. But if you can't use the data attribute for some
+reason, for instance, you are working in Java or because you need an inheritance heirarchy, then consider that making
+a class fully immutable may result in very awkward code if there's ever a need to make complex changes to it. If in
+doubt, ask. Remember, never apply any design pattern religiously.
+
+4. Assertions and errors
+########################
+
+We use them liberally and we use them at runtime, in production. That means we avoid the "assert" keyword in Java,
+and instead prefer to use the ``check()`` or ``require()`` functions in Kotlin (for an ``IllegalStateException`` or
+``IllegalArgumentException`` respectively), or the Guava ``Preconditions.check`` method from Java.
+
+We define new exception types liberally. We prefer not to provide English language error messages in exceptions at
+the throw site, instead we define new types with any useful information as fields, with a toString() method if
+really necessary. In other words, don't do this:
+
+.. sourcecode:: java
+
+ throw new Exception("The foo broke")
+
+instead do this
+
+.. sourcecode:: java
+
+ class FooBrokenException extends Exception {}
+ throw new FooBrokenException()
+
+The latter is easier to catch and handle if later necessary, and the type name should explain what went wrong.
+
+Note that Kotlin does not require exception types to be declared in method prototypes like Java does.
+
diff --git a/docs/build/html/_sources/index.txt b/docs/build/html/_sources/index.txt
index 5858b1327b..d0e75160f0 100644
--- a/docs/build/html/_sources/index.txt
+++ b/docs/build/html/_sources/index.txt
@@ -41,4 +41,5 @@ Read on to learn:
visualiser
roadmap
+ codestyle
diff --git a/docs/build/html/_sources/protocol-state-machines.txt b/docs/build/html/_sources/protocol-state-machines.txt
index 871bfe4cf1..57c54148aa 100644
--- a/docs/build/html/_sources/protocol-state-machines.txt
+++ b/docs/build/html/_sources/protocol-state-machines.txt
@@ -146,8 +146,8 @@ each side.
)
- private class UnacceptablePriceException(val givenPrice: Amount) : Exception()
- private class AssetMismatchException(val expectedTypeName: String, val typeName: String) : Exception() {
+ class UnacceptablePriceException(val givenPrice: Amount) : Exception()
+ class AssetMismatchException(val expectedTypeName: String, val typeName: String) : Exception() {
override fun toString() = "The submitted asset didn't match the expected type: $expectedTypeName vs $typeName"
}
diff --git a/docs/build/html/_static/basic.css b/docs/build/html/_static/basic.css
index 9fa77d886d..c89fc7e920 100644
--- a/docs/build/html/_static/basic.css
+++ b/docs/build/html/_static/basic.css
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/docs/build/html/_static/doctools.js b/docs/build/html/_static/doctools.js
index c7bfe760aa..e2e70cc287 100644
--- a/docs/build/html/_static/doctools.js
+++ b/docs/build/html/_static/doctools.js
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/docs/build/html/_static/pygments.css b/docs/build/html/_static/pygments.css
index 57eadc030e..8213e90bed 100644
--- a/docs/build/html/_static/pygments.css
+++ b/docs/build/html/_static/pygments.css
@@ -4,8 +4,10 @@
.highlight .err { border: 1px solid #FF0000 } /* Error */
.highlight .k { color: #007020; font-weight: bold } /* Keyword */
.highlight .o { color: #666666 } /* Operator */
+.highlight .ch { color: #408090; font-style: italic } /* Comment.Hashbang */
.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
.highlight .cp { color: #007020 } /* Comment.Preproc */
+.highlight .cpf { color: #408090; font-style: italic } /* Comment.PreprocFile */
.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #A00000 } /* Generic.Deleted */
diff --git a/docs/build/html/_static/searchtools.js b/docs/build/html/_static/searchtools.js
index 0e794fd3e9..cb7446728a 100644
--- a/docs/build/html/_static/searchtools.js
+++ b/docs/build/html/_static/searchtools.js
@@ -4,12 +4,13 @@
*
* Sphinx JavaScript utilties for the full-text search.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
+/* Non-minified version JS is _stemmer.js if file is provided */
/**
* Porter Stemmer
*/
@@ -373,8 +374,7 @@ var Search = {
}
// lookup as search terms in fulltext
- results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
- .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
+ results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
// let the scorer override scores with a custom scoring function
if (Scorer.score) {
@@ -538,23 +538,47 @@ var Search = {
/**
* search for full-text terms in the index
*/
- performTermsSearch : function(searchterms, excluded, terms, score) {
+ performTermsSearch : function(searchterms, excluded, terms, titleterms) {
var filenames = this._index.filenames;
var titles = this._index.titles;
- var i, j, file, files;
+ var i, j, file;
var fileMap = {};
+ var scoreMap = {};
var results = [];
// perform the search on the required terms
for (i = 0; i < searchterms.length; i++) {
var word = searchterms[i];
+ var files = [];
+ var _o = [
+ {files: terms[word], score: Scorer.term},
+ {files: titleterms[word], score: Scorer.title}
+ ];
+
// no match but word was a required one
- if ((files = terms[word]) === undefined)
+ if ($u.every(_o, function(o){return o.files === undefined;})) {
break;
- if (files.length === undefined) {
- files = [files];
}
+ // found search word in contents
+ $u.each(_o, function(o) {
+ var _files = o.files;
+ if (_files === undefined)
+ return
+
+ if (_files.length === undefined)
+ _files = [_files];
+ files = files.concat(_files);
+
+ // set score for the word in each file to Scorer.term
+ for (j = 0; j < _files.length; j++) {
+ file = _files[j];
+ if (!(file in scoreMap))
+ scoreMap[file] = {}
+ scoreMap[file][word] = o.score;
+ }
+ });
+
// create the mapping
for (j = 0; j < files.length; j++) {
file = files[j];
@@ -576,7 +600,9 @@ var Search = {
// ensure that none of the excluded terms is in the search result
for (i = 0; i < excluded.length; i++) {
if (terms[excluded[i]] == file ||
- $u.contains(terms[excluded[i]] || [], file)) {
+ titleterms[excluded[i]] == file ||
+ $u.contains(terms[excluded[i]] || [], file) ||
+ $u.contains(titleterms[excluded[i]] || [], file)) {
valid = false;
break;
}
@@ -584,6 +610,9 @@ var Search = {
// if we have still a valid result we can add it to the result list
if (valid) {
+ // select one (max) score for the file.
+ // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
+ var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
results.push([filenames[file], titles[file], '', null, score]);
}
}
diff --git a/docs/build/html/_static/websupport.js b/docs/build/html/_static/websupport.js
index 28d65db4aa..ffd9b2bfdc 100644
--- a/docs/build/html/_static/websupport.js
+++ b/docs/build/html/_static/websupport.js
@@ -4,7 +4,7 @@
*
* sphinx.websupport utilties for all documentation.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/docs/build/html/codestyle.html b/docs/build/html/codestyle.html
new file mode 100644
index 0000000000..8ab4c931e8
--- /dev/null
+++ b/docs/build/html/codestyle.html
@@ -0,0 +1,355 @@
+
+
+
+
+
+
+
+
+
+
+ Code style guide — R3 Prototyping 0.1 documentation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
This document explains the coding style used in the R3 prototyping repository. You will be expected to follow these
+recommendations when submitting patches for review. Please take the time to read them and internalise them, to save
+time during code review.
+
What follows are recommendations and not rules. They are in places intentionally vague, so use your good judgement
+when interpreting them.
+
+
Note
+
Parts of the codebase may not follow this style guide yet. If you see a place that doesn’t, please fix it!
We use the standard Java coding style from Sun, adapted for Kotlin in ways that should be fairly intuitive.
+
We aim for line widths of no more than 120 characters. That is wide enough to avoid lots of pointless wrapping but
+narrow enough that with a widescreen monitor and a 12 point fixed width font (like Menlo) you can fit two files
+next to each other. This is not a rigidly enforced rule and if wrapping a line would be excessively awkward, let it
+overflow. Overflow of a few characters here and there isn’t a big deal: the goal is general convenience.
+
Code is vertically dense, blank lines in methods are used sparingly. This is so more code can fit on screen at once.
+
Each file has a copyright notice at the top. Copy it from the existing files if you create a new one. We do not mark
+classes with @author Javadoc annotations.
+
In Kotlin code, KDoc is used rather than JavaDoc. It’s very similar except it uses Markdown for formatting instead
+of HTML tags.
+
We target Java 8 and use the latest Java APIs whenever convenient. We use java.time.Instant to represent timestamps
+and java.nio.file.Path to represent file paths.
+
We use spaces and not tabs.
+
Never apply any design pattern religiously. There are no silver bullets in programming and if something is fashionable,
+that doesn’t mean it’s always better. In particular:
+
+
Use functional programming patterns like map, filter, fold only where it’s genuinely more convenient. Never be afraid
+to use a simple imperative construct like a for loop or a mutable counter if that results in more direct, English-like
+code.
+
Use immutability when you don’t anticipate very rapid or complex changes to the content. Immutability can help avoid
+bugs, but over-used it can make code that has to adjust fields of an immutable object (in a clone) hard to read and
+stress the garbage collector. When such code becomes a widespread pattern it can lead to code that is just generically
+slow but without hotspots.
+
The tradeoffs between various thread safety techniques are complex, subtle, and no technique is always superior to
+the others. Our code uses a mix of locks, worker threads and messaging depending on the situation.
We like them as long as they add detail that is missing from the code. Comments that simply repeat the story already
+told by the code are best deleted. Comments should:
+
+
Explain what the code is doing at a higher level than is obtainable from just examining the statement and
+surrounding code.
+
Explain why certain choices were made and the tradeoffs considered.
+
Explain how things can go wrong, which is a detail often not easily seen just by reading the code.
+
Use good grammar with capital letters and full stops. This gets us in the right frame of mind for writing real
+explanations of things.
+
+
When writing code, imagine that you have an intelligent colleague looking over your shoulder asking you questions
+as you go. Think about what they might ask, and then put your answers in the code.
+
Don’t be afraid of redundancy, many people will start reading your code in the middle with little or no idea of what
+it’s about, eg, due to a bug or a need to introduce a new feature. It’s OK to repeat basic facts or descriptions in
+different places if that increases the chance developers will see something important.
+
API docs: all public methods, constants and classes should have doc comments in either JavaDoc or KDoc. API docs should:
+
+
Explain what the method does in words different to how the code describes it.
+
Always have some text, annotation-only JavaDocs don’t render well. Write “Returns a blah blah blah” rather
+than “@returns blah blah blah” if that’s the only content (or leave it out if you have nothing more to say than the
+code already says).
+
Illustrate with examples when you might want to use the method or class. Point the user at alternatives if this code
+is not always right.
/** @return the size of the Bloom filter. */
+publicintgetBloomFilterSize(){
+ returnblock;
+}
+
+
+
Good JavaDocs look like this:
+
/**
+ * Returns the size of the current {@link BloomFilter} in bytes. Larger filters have
+ * lower false positive rates for the same number of inserted keys and thus lower privacy,
+ * but bandwidth usage is also correspondingly reduced.
+ */
+publicintgetBloomFilterSize(){...}
+
+
+
We use C-style (/***/) comments for API docs and we use C++ style comments (//) for explanations that are
+only intended to be viewed by people who read the code.
Classes that are thread safe should be annotated with the @ThreadSafe annotation. The class or method comments
+should describe how threads are expected to interact with your code, unless it’s obvious because the class is
+(for example) a simple immutable data holder.
+
Code that supports callbacks or event listeners should always accept an Executor argument that defaults to
+MoreExecutors.directThreadExecutor() (i.e. the calling thread) when registering the callback. This makes it easy
+to integrate the callbacks with whatever threading environment the calling code expects, e.g. serialised onto a single
+worker thread if necessary, or run directly on the background threads used by the class if the callback is thread safe
+and doesn’t care in what context it’s invoked.
+
In the prototyping code it’s OK to use synchronised methods i.e. with an exposed lock when the use of locking is quite
+trivial. If the synchronisation in your code is getting more complex, consider the following:
+
+
Is the complexity necessary? At this early stage, don’t worry too much about performance or scalability, as we’re
+exploring the design space rather than making an optimal implementation of a design that’s already nailed down.
+
Could you simplify it by making the data be owned by a dedicated, encapsulated worker thread? If so, remember to
+think about flow control and what happens if a work queue fills up: the actor model can often be useful but be aware
+of the downsides and try to avoid explicitly defining messages, prefer to send closures onto the worker thread
+instead.
+
If you use an explicit lock and the locking gets complex, and always if the class supports callbacks, use the
+cycle detecting locks from the Guava library.
+
Can you simplify some things by using thread-safe collections like CopyOnWriteArrayList or ConcurrentHashMap?
+These data structures are more expensive than their non-thread-safe equivalents but can be worth it if it lets us
+simplify the code.
+
+
Immutable data structures can be very useful for making it easier to reason about multi-threaded code. Kotlin makes it
+easy to define these via the “data” attribute, which auto-generates a copy() method. That lets you create clones of
+an immutable object with arbitrary fields adjusted in the clone. But if you can’t use the data attribute for some
+reason, for instance, you are working in Java or because you need an inheritance heirarchy, then consider that making
+a class fully immutable may result in very awkward code if there’s ever a need to make complex changes to it. If in
+doubt, ask. Remember, never apply any design pattern religiously.
We use them liberally and we use them at runtime, in production. That means we avoid the “assert” keyword in Java,
+and instead prefer to use the check() or require() functions in Kotlin (for an IllegalStateException or
+IllegalArgumentException respectively), or the Guava Preconditions.check method from Java.
+
We define new exception types liberally. We prefer not to provide English language error messages in exceptions at
+the throw site, instead we define new types with any useful information as fields, with a toString() method if
+really necessary. In other words, don’t do this: