Merge pull request #1065 from anikitinDSR/1.6.79-rc

1.6.79 rc
hyperledger · Nov 30, 2018 · 29a4853 · 29a4853
2 parents 2a8f2ab + c0949cb
commit 29a4853
Show file tree

Hide file tree

Showing 401 changed files with 9,113 additions and 28,060 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Jenkinsfile.cd b/Jenkinsfile.cd
@@ -27,29 +27,6 @@ def nodeTestUbuntu = {
     }
 }
 
-def clientTestUbuntu = {
-    try {
-        echo 'Ubuntu Test: Checkout csm'
-        checkout scm
-
-        echo 'Ubuntu Test: Build docker image'
-        def testEnv = dockerHelpers.build(name)
-
-        testEnv.inside('--network host') {
-            echo 'Ubuntu Test: Install dependencies'
-            testHelpers.install()
-
-            echo 'Ubuntu Test: Test'
-            testHelpers.testRunner([resFile: "test-result-client.${NODE_NAME}.txt", testDir: 'indy_client'])
-            //testHelpers.testJUnit(resFile: "test-result-client.${NODE_NAME}.xml")
-        }
-    }
-    finally {
-        echo 'Ubuntu Test: Cleanup'
-        step([$class: 'WsCleanup'])
-    }
-}
-
 def commonTestUbuntu = {
     try {
         echo 'Ubuntu Test: Checkout csm'
@@ -91,4 +68,4 @@ options = new TestAndPublishOptions()
 options.enable([StagesEnum.PACK_RELEASE_COPY, StagesEnum.PACK_RELEASE_COPY_ST])
 options.setCopyWithDeps(true)
 options.setPrContexts([env.INDY_GITHUB_PR_REQUIRED_CONTEXT ?: "ci/hyperledger-jenkins/pr-merge"])
-testAndPublish(name, [ubuntu: [node: nodeTestUbuntu, client: clientTestUbuntu, common: commonTestUbuntu]], true, options, [ubuntu: buildDebUbuntu])
+testAndPublish(name, [ubuntu: [node: nodeTestUbuntu, common: commonTestUbuntu]], true, options, [ubuntu: buildDebUbuntu])
diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -142,14 +142,6 @@ def tests = [
             python: python
         )
     },
-    client: { python ->
-        test(
-            resFile: "test-result-client.${NODE_NAME}.txt",
-            testDir: 'indy_client',
-            python: python,
-            useRunner: true
-        )
-    },
     node: { python ->
         test(
             resFile: "test-result-node.${NODE_NAME}.txt",

diff --git a/README.md b/README.md
@@ -69,15 +69,10 @@ Indy Node repo consists of the following parts:
       So, if you want to work with Indy Node, you will need to have the Plenum code as well in most of the cases
       and work with two projects at the same time 
       (see [How to Start Working with the Code](#how-to-start-working-with-the-code) below).
-- [indy-anoncreds](https://github.com/hyperledger/indy-anoncreds) 
-    - A python implementation of the anonymous credentials ideas developed by IBM Research.
-    - This is quite independent from indy-node/plenum. So, in most cases you don't need this code to contribute to Indy-Node.
-    - It will be deprecated soon in favor of anoncreds implementation in indy-sdk (see below). 
 - [indy-sdk](https://github.com/hyperledger/indy-sdk)
     - An official SDK for Indy.
     - it contains client and anoncreds implementation
     - You don't need it to contribute to Indy-Node. But please use indy-sdk for your own applications dealing with Indy ecosystem.
-    - It will replace indy-client and indy-anoncreds parsts soon.
 - [indy-crypto](https://github.com/hyperledger/indy-crypto)
     - A shared crypto library 
     - It's based on [AMCL](https://github.com/milagro-crypto/amcl)
@@ -119,14 +114,6 @@ The described process is automated in one of the ways below (it allow to install
 Please have a look at [Dev Setup](docs/setup-dev.md)
 
 
-## How to Start Indy Client CLI
-Once installed, you can play with the command-line interface by running Indy from a terminal.
-
-Note: For Windows, we recommended using either [cmder](http://cmder.net/) or [conemu](https://conemu.github.io/).
-```
-indy
-```
-
 ## Continuous Integration and Delivery
 
 Please have a look at [Continuous integration/delivery](docs/ci-cd.md)
@@ -167,10 +154,12 @@ If you made changes in both indy-plenum and indy-node, you need to do the follow
 - Please have a look at documents and diagrams in [docs](docs) folder
 - Please have a look at documents and diagrams in Plenum's [docs](https://github.com/hyperledger/indy-plenum/tree/master/docs) folder:
     - [Technical Overview of Plenum](https://github.com/hyperledger/indy-plenum/blob/master/docs/main.md)
+    - [Plenum Consensus Algorithm Diagram](https://github.com/hyperledger/indy-plenum/blob/master/docs/diagrams/consensus-protocol.png)
     - [Glossary](https://github.com/hyperledger/indy-plenum/blob/master/docs/glossary.md)
     - [Storages](https://github.com/hyperledger/indy-plenum/blob/master/docs/storage.md)
     - [Request Handling](https://github.com/hyperledger/indy-plenum/blob/master/docs/request_handling.md)
     - [Catchup](https://github.com/hyperledger/indy-plenum/blob/master/docs/catchup.md)
+    - [Catchup Diagram](https://github.com/hyperledger/indy-plenum/blob/master/docs/diagrams/catchup-procedure.png)
     - [Plugins](https://github.com/hyperledger/indy-plenum/blob/master/docs/plugins.md)
 - Relationship between Entities and Transactions: [relationship diagram](docs/relationship-diagram.png)
 - Supported transactions and their format: [transactions](docs/transactions.md)

diff --git a/acceptance/indy-cli-batches/expected/AS-01-01-general-1.expected b/acceptance/indy-cli-batches/expected/AS-01-01-general-1.expected
@@ -1,71 +1,71 @@
 - pool create AS-pool gen_txn_file=./pool_transactions_genesis
-[1;32mPool config "AS-pool" has been created[0m
+Pool config "AS-pool" has been created
 
 pool connect AS-pool
-[1;32mPool "AS-pool" has been connected[0m
+Pool "AS-pool" has been connected
 
 wallet create AS-01-wallet-1 key=testkey storage_config={"pool":"AS-pool"}
-[1;32mWallet "AS-01-wallet-1" has been created[0m
+Wallet "AS-01-wallet-1" has been created
 
 wallet open AS-01-wallet-1 key=testkey
-[1;32mWallet "AS-01-wallet-1" has been opened[0m
+Wallet "AS-01-wallet-1" has been opened
 
 did new seed=000000000000000000000000Trustee1 metadata="default trustee"
-[1;32mDid "V4SGRU86Z58d6TV7PBUe6f" has been created with "~CoRER63DVYnWZtK8uAzNbx" verkey[0m
-[1;32mMetadata has been saved for DID "V4SGRU86Z58d6TV7PBUe6f"[0m
+Did "V4SGRU86Z58d6TV7PBUe6f" has been created with "~CoRER63DVYnWZtK8uAzNbx" verkey
+Metadata has been saved for DID "V4SGRU86Z58d6TV7PBUe6f"
 
 did new seed=000000000000000000000NewSteward1 metadata="new steward"
-[1;32mDid "5Ur5boqV3EXobXhtfow83q" has been created with "~WWyzovtLNpZW8iAfu9qSN5" verkey[0m
-[1;32mMetadata has been saved for DID "5Ur5boqV3EXobXhtfow83q"[0m
+Did "5Ur5boqV3EXobXhtfow83q" has been created with "~WWyzovtLNpZW8iAfu9qSN5" verkey
+Metadata has been saved for DID "5Ur5boqV3EXobXhtfow83q"
 
 did use V4SGRU86Z58d6TV7PBUe6f
-[1;32mDid "V4SGRU86Z58d6TV7PBUe6f" has been set as active[0m
+Did "V4SGRU86Z58d6TV7PBUe6f" has been set as active
 
 ledger nym did=5Ur5boqV3EXobXhtfow83q verkey=~WWyzovtLNpZW8iAfu9qSN5 role=STEWARD
-[1;32mNym request has been sent to Ledger.[0m
-[1;32mMetadata:[0m
+Nym request has been sent to Ledger.
+Metadata:
 +---------------------+---------------------+
 | Request ID          | Transaction time    |
 +---------------------+---------------------+
 | 1527781962070712451 | 2018-05-31 15:52:42 |
 +---------------------+---------------------+
-[1;32mData:[0m
+Data:
 +------------------------+-------------------------+---------+
 | Did                    | Verkey                  | Role    |
 +------------------------+-------------------------+---------+
 | 5Ur5boqV3EXobXhtfow83q | ~WWyzovtLNpZW8iAfu9qSN5 | STEWARD |
 +------------------------+-------------------------+---------+
 
 did use 5Ur5boqV3EXobXhtfow83q
-[1;32mDid "5Ur5boqV3EXobXhtfow83q" has been set as active[0m
+Did "5Ur5boqV3EXobXhtfow83q" has been set as active
 
 did rotate-key
-[1;32mVerkey for did "5Ur5boqV3EXobXhtfow83q" has been updated. New verkey: "J1WyzFAvS4DUoGGf6eo9sX1iXJ7jayeX677Nh3VAwVRk"[0m
+Verkey for did "5Ur5boqV3EXobXhtfow83q" has been updated. New verkey: "J1WyzFAvS4DUoGGf6eo9sX1iXJ7jayeX677Nh3VAwVRk"
 
 ledger nym did=NyLkggDnCtZY6ngkfNqzg2 verkey=~LTar8Y3uzcQEt3HdhgqtSz
-[1;32mNym request has been sent to Ledger.[0m
-[1;32mMetadata:[0m
+Nym request has been sent to Ledger.
+Metadata:
 +---------------------+---------------------+
 | Request ID          | Transaction time    |
 +---------------------+---------------------+
 | 1527781962599906305 | 2018-05-31 15:52:42 |
 +---------------------+---------------------+
-[1;32mData:[0m
+Data:
 +------------------------+-------------------------+------+
 | Did                    | Verkey                  | Role |
 +------------------------+-------------------------+------+
 | NyLkggDnCtZY6ngkfNqzg2 | ~LTar8Y3uzcQEt3HdhgqtSz | -    |
 +------------------------+-------------------------+------+
 
 - ledger get-nym did=NyLkggDnCtZY6ngkfNqzg2
-[1;32mFollowing NYM has been received.[0m
-[1;32mMetadata:[0m
+Following NYM has been received.
+Metadata:
 +-----------------+---------------------+---------------------+
 | Sequence Number | Request ID          | Transaction time    |
 +-----------------+---------------------+---------------------+
 | 1526            | 1527781962844903608 | 2018-05-31 15:52:42 |
 +-----------------+---------------------+---------------------+
-[1;32mData:[0m
+Data:
 +------------------------+------------------------+-------------------------+------+
 | Identifier             | Dest                   | Verkey                  | Role |
 +------------------------+------------------------+-------------------------+------+
@@ -80,60 +80,60 @@ did list
 +------------------------+----------------------------------------------+-----------------+
 | 5Ur5boqV3EXobXhtfow83q | J1WyzFAvS4DUoGGf6eo9sX1iXJ7jayeX677Nh3VAwVRk | new steward     |
 +------------------------+----------------------------------------------+-----------------+
-[1;32mCurrent did "5Ur5boqV3EXobXhtfow83q"[0m
+Current did "5Ur5boqV3EXobXhtfow83q"
 
 wallet create AS-01-identity-wallet key=testkey storage_config={"pool":"AS-pool"}
-[1;32mWallet "AS-01-identity-wallet" has been created[0m
+Wallet "AS-01-identity-wallet" has been created
 
 wallet open AS-01-identity-wallet key=testkey
-[1;32mWallet "AS-01-wallet-1" has been closed[0m
-[1;32mWallet "AS-01-identity-wallet" has been opened[0m
+Wallet "AS-01-wallet-1" has been closed
+Wallet "AS-01-identity-wallet" has been opened
 
 did new seed=00000000000000000000000Identity1 metadata="new identity"
-[1;32mDid "NyLkggDnCtZY6ngkfNqzg2" has been created with "~LTar8Y3uzcQEt3HdhgqtSz" verkey[0m
-[1;32mMetadata has been saved for DID "NyLkggDnCtZY6ngkfNqzg2"[0m
+Did "NyLkggDnCtZY6ngkfNqzg2" has been created with "~LTar8Y3uzcQEt3HdhgqtSz" verkey
+Metadata has been saved for DID "NyLkggDnCtZY6ngkfNqzg2"
 
 did use NyLkggDnCtZY6ngkfNqzg2
-[1;32mDid "NyLkggDnCtZY6ngkfNqzg2" has been set as active[0m
+Did "NyLkggDnCtZY6ngkfNqzg2" has been set as active
 
 - ledger get-nym did=NyLkggDnCtZY6ngkfNqzg2
-[1;32mFollowing NYM has been received.[0m
-[1;32mMetadata:[0m
+Following NYM has been received.
+Metadata:
 +-----------------+---------------------+---------------------+
 | Sequence Number | Request ID          | Transaction time    |
 +-----------------+---------------------+---------------------+
 | 1526            | 1527781964929492594 | 2018-05-31 15:52:42 |
 +-----------------+---------------------+---------------------+
-[1;32mData:[0m
+Data:
 +------------------------+------------------------+-------------------------+------+
 | Identifier             | Dest                   | Verkey                  | Role |
 +------------------------+------------------------+-------------------------+------+
 | 5Ur5boqV3EXobXhtfow83q | NyLkggDnCtZY6ngkfNqzg2 | ~LTar8Y3uzcQEt3HdhgqtSz | -    |
 +------------------------+------------------------+-------------------------+------+
 
 did rotate-key
-[1;32mVerkey for did "NyLkggDnCtZY6ngkfNqzg2" has been updated. New verkey: "5TKaMf8EXoad6tLMptGNuh4563Vg9znFnBJ1iZH7zDJu"[0m
+Verkey for did "NyLkggDnCtZY6ngkfNqzg2" has been updated. New verkey: "5TKaMf8EXoad6tLMptGNuh4563Vg9znFnBJ1iZH7zDJu"
 
 - ledger get-nym did=NyLkggDnCtZY6ngkfNqzg2
-[1;32mFollowing NYM has been received.[0m
-[1;32mMetadata:[0m
+Following NYM has been received.
+Metadata:
 +-----------------+---------------------+---------------------+
 | Sequence Number | Request ID          | Transaction time    |
 +-----------------+---------------------+---------------------+
 | 1527            | 1527781965229610522 | 2018-05-31 15:52:45 |
 +-----------------+---------------------+---------------------+
-[1;32mData:[0m
+Data:
 +------------------------+------------------------+----------------------------------------------+------+
 | Identifier             | Dest                   | Verkey                                       | Role |
 +------------------------+------------------------+----------------------------------------------+------+
 | 5Ur5boqV3EXobXhtfow83q | NyLkggDnCtZY6ngkfNqzg2 | 5TKaMf8EXoad6tLMptGNuh4563Vg9znFnBJ1iZH7zDJu | -    |
 +------------------------+------------------------+----------------------------------------------+------+
 
 wallet close
-[1;32mWallet "AS-01-identity-wallet" has been closed[0m
+Wallet "AS-01-identity-wallet" has been closed
 
 pool disconnect
-[1;32mPool "AS-pool" has been disconnected[0m
+Pool "AS-pool" has been disconnected
 
 wallet list
 +-----------------------+----------------------+---------+
@@ -151,4 +151,4 @@ pool list
 | AS-pool |
 +---------+
 
-[1;32mGoodbye...[0m
+Goodbye...