ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix some typos

Browse Source 
Signed-off-by: racerole <jiangyifeng@outlook.com>
This commit is contained in:
racerole 2024-03-06 11:06:13 +08:00
parent 6bdad94236
commit 4d1d1b0c9c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/net/corda/core/internal/TransactionUtils.kt
View File

@ -201,7 +201,7 @@ fun createComponentGroups(inputs: List<StateRef>,
componentGroupMap.addListGroup(COMMANDS_GROUP, commands.map { it.value }, serialize) componentGroupMap.addListGroup(COMMANDS_GROUP, commands.map { it.value }, serialize)
// Attachments which can only be processed by 4.12 and later. // Attachments which can only be processed by 4.12 and later.
componentGroupMap.addListGroup(ATTACHMENTS_V2_GROUP, attachments, serialize) componentGroupMap.addListGroup(ATTACHMENTS_V2_GROUP, attachments, serialize)
// The original attachments group now only contains attachments which can be processed by 4.11 and ealier (and the external verifier). // The original attachments group now only contains attachments which can be processed by 4.11 and earlier (and the external verifier).
componentGroupMap.addListGroup(ATTACHMENTS_GROUP, legacyAttachments, serialize) componentGroupMap.addListGroup(ATTACHMENTS_GROUP, legacyAttachments, serialize)
if (notary != null) componentGroupMap.add(ComponentGroup(NOTARY_GROUP.ordinal, listOf(notary).lazyMapped(serialize))) if (notary != null) componentGroupMap.add(ComponentGroup(NOTARY_GROUP.ordinal, listOf(notary).lazyMapped(serialize)))
if (timeWindow != null) componentGroupMap.add(ComponentGroup(TIMEWINDOW_GROUP.ordinal, listOf(timeWindow).lazyMapped(serialize))) if (timeWindow != null) componentGroupMap.add(ComponentGroup(TIMEWINDOW_GROUP.ordinal, listOf(timeWindow).lazyMapped(serialize)))

2
core/src/main/kotlin/net/corda/core/transactions/MerkleTransaction.kt
View File

@ -42,7 +42,7 @@ abstract class TraversableTransaction(open val componentGroups: List<ComponentGr
* Returns the attachments compatible with 4.12 and later. This will be empty for transactions created on 4.11 or earlier. * Returns the attachments compatible with 4.12 and later. This will be empty for transactions created on 4.11 or earlier.
* *
* [legacyAttachments] and [nonLegacyAttachments] are independent of each other and may contain the same attachments. This is to provide backwards * [legacyAttachments] and [nonLegacyAttachments] are independent of each other and may contain the same attachments. This is to provide backwards
* compatiblity and enable both 4.11 and 4.12 nodes to verify the same transaction. * compatibility and enable both 4.11 and 4.12 nodes to verify the same transaction.
*/ */
@CordaInternal @CordaInternal
@JvmSynthetic @JvmSynthetic

2
docker/src/bash/generate-config.sh
View File

@ -37,7 +37,7 @@ function generateGenericCZConfig() {
: ${MY_EMAIL_ADDRESS:? '$MY_EMAIL_ADDRESS, the email to use when joining must be set as an environment variable'} : ${MY_EMAIL_ADDRESS:? '$MY_EMAIL_ADDRESS, the email to use when joining must be set as an environment variable'}
: ${NETWORK_TRUST_PASSWORD=:? '$NETWORK_TRUST_PASSWORD, the password to the network store to use when joining must be set as environment variable'} : ${NETWORK_TRUST_PASSWORD=:? '$NETWORK_TRUST_PASSWORD, the password to the network store to use when joining must be set as environment variable'}
: ${RPC_USER=:? '$RPC_USER, the name of the primary rpc user must be set as environment variable'} : ${RPC_USER=:? '$RPC_USER, the name of the primary rpc user must be set as environment variable'}
: ${SSHPORT=:? 'SSHPORT, the port number for the SSHD must be set as enviroment variable'} : ${SSHPORT=:? 'SSHPORT, the port number for the SSHD must be set as environment variable'}
if [[ ! -f ${CERTIFICATES_FOLDER}/${TRUST_STORE_NAME} ]]; then if [[ ! -f ${CERTIFICATES_FOLDER}/${TRUST_STORE_NAME} ]]; then

6
docker/test-docker.sh
View File

@ -41,8 +41,8 @@ docker run -d --name corda-test-${SALT} --network=host --hostname=127.0.0.1 \
-e CORDA_ARGS="--log-to-console --no-local-shell" \ -e CORDA_ARGS="--log-to-console --no-local-shell" \
$IMAGE config-generator --generic $IMAGE config-generator --generic
# Succesfully registered (with http://localhost:8080) # Successfully registered (with http://localhost:8080)
docker logs -f corda-test-${SALT} | grep -q "Succesfully registered" docker logs -f corda-test-${SALT} | grep -q "Successfully registered"
if [ ! "$(docker ps -q -f name=corda-test-${SALT})" ]; then if [ ! "$(docker ps -q -f name=corda-test-${SALT})" ]; then
echo "TEST-IMAGE-${IMAGE}: FAIL corda-test has exited." echo "TEST-IMAGE-${IMAGE}: FAIL corda-test has exited."
docker logs corda-test-${SALT} docker logs corda-test-${SALT}
@ -50,7 +50,7 @@ if [ ! "$(docker ps -q -f name=corda-test-${SALT})" ]; then
docker rm -f corda-test-${SALT} docker rm -f corda-test-${SALT}
exit 1 exit 1
else else
echo "TEST-IMAGE-${IMAGE}: SUCCESS : Succesfully registered with http://localhost:8080" echo "TEST-IMAGE-${IMAGE}: SUCCESS : Successfully registered with http://localhost:8080"
fi fi
# Node started up and registered # Node started up and registered

2
experimental/avalanche/Readme.md
View File

@ -18,7 +18,7 @@ for f in node-0-*.dot; do dot -Tpng -O $f; done
``` ```
The above command generates a number of PNG files `node-0-*.png`, showing the The above command generates a number of PNG files `node-0-*.png`, showing the
evolution of the DAG. The nodes are labeled with the ID of the spent state, evolution of the DAG. The nodes are labeled with the ID of the spent state,
the chit and confidence values. The prefered transaction of a conflict set is the chit and confidence values. The preferred transaction of a conflict set is
labelled with a star. Accepted transactions are blue. labelled with a star. Accepted transactions are blue.
![DAG](./images/node-0-003.dot.png) ![DAG](./images/node-0-003.dot.png)