Merge remote-tracking branch 'main/master' into add-hashable-index-ECR-4064

dmitry-timofeev · dmitry-timofeev · commit 4020af4eee6f · 2020-01-17T11:55:06.000+02:00
diff --git a/exonum-java-binding/core/src/main/java/com/exonum/binding/core/service/Schema.java b/exonum-java-binding/core/src/main/java/com/exonum/binding/core/service/Schema.java
@@ -22,7 +22,7 @@
  * A schema of the collections (a.k.a. indices) of a service.
  *
  * <p>To verify the integrity of the database state on each node in the network,
- * the core automatically tracks every Merkelized collection used by the user
+ * Exonum automatically tracks every Merkelized collection used by the user
  * services. It aggregates state hashes of these collections into a single
  * Merkelized meta-map. The hash of this meta-map is considered the hash of the
  * entire blockchain state and is recorded as such in {@linkplain Block#getStateHash() blocks}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* A schema of the collections (a.k.a. indices) of a service.`
`23`	`23`	`*`
`24`	`24`	`* <p>To verify the integrity of the database state on each node in the network,`
`25`		`- * the core automatically tracks every Merkelized collection used by the user`
	`25`	`+ * Exonum automatically tracks every Merkelized collection used by the user`
`26`	`26`	`* services. It aggregates state hashes of these collections into a single`
`27`	`27`	`* Merkelized meta-map. The hash of this meta-map is considered the hash of the`
`28`	`28`	`* entire blockchain state and is recorded as such in {@linkplain Block#getStateHash() blocks}`