Merge pull request #2030 from jyellick/remove-deprecated-sieve

Remove the sieve PBFT consensus plugin and all references to it
hyperledger · Jun 28, 2016 · 03c751f · 03c751f
2 parents 78fa375 + 049601f
commit 03c751f
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 2,741 deletions.
diff --git a/bddtests/docker-compose-4-consensus-base.yml b/bddtests/docker-compose-4-consensus-base.yml
@@ -13,22 +13,6 @@ vpBase:
     # The checkpoint interval in sequence numbers
     - CORE_PBFT_GENERAL_K=2
 
-vpSieve:
-  extends:
-    service: vpBase
-  environment:
-    - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft
-    - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
-    - CORE_PBFT_GENERAL_MODE=sieve
-
-vpClassic:
-  extends:
-    service: vpBase
-  environment:
-    - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft
-    - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
-    - CORE_PBFT_GENERAL_MODE=classic
-
 vpBatch:
   extends:
     service: vpBase

diff --git a/bddtests/docker-compose-4-consensus-classic-1-byzantine.yml b/bddtests/docker-compose-4-consensus-classic-1-byzantine.yml
diff --git a/bddtests/docker-compose-4-consensus-classic.yml b/bddtests/docker-compose-4-consensus-classic.yml
diff --git a/bddtests/docker-compose-4-consensus-sieve-1-byzantine.yml b/bddtests/docker-compose-4-consensus-sieve-1-byzantine.yml
diff --git a/bddtests/docker-compose-4-consensus-sieve.yml b/bddtests/docker-compose-4-consensus-sieve.yml
diff --git a/bddtests/peer_basic.feature b/bddtests/peer_basic.feature
@@ -447,9 +447,7 @@ Feature: Network of Peers
     Examples: Consensus Options
         |          ComposeFile                     |   WaitTime   |
         |   docker-compose-4-consensus-noops.yml   |      60      |
-#       |   docker-compose-4-consensus-classic.yml |      60      |
         |   docker-compose-4-consensus-batch.yml   |      60      |
-#       |   docker-compose-4-consensus-sieve.yml   |      60      |
 
 
     #@doNotDecompose
@@ -531,9 +529,7 @@ Feature: Network of Peers
 
     Examples: Consensus Options
         |          ComposeFile                       |   WaitTime   |
-#       |   docker-compose-4-consensus-classic.yml   |      60      |
         |   docker-compose-4-consensus-batch.yml     |      60      |
-#       |   docker-compose-4-consensus-sieve.yml     |      60      |
 
 
 #    @doNotDecompose
@@ -658,9 +654,7 @@ Feature: Network of Peers
 
    Examples: Consensus Options
        |          ComposeFile                       |   WaitTime   |
-#      |   docker-compose-4-consensus-classic.yml   |      60      |
        |   docker-compose-4-consensus-batch.yml     |      60      |
-#      |   docker-compose-4-consensus-sieve.yml     |      60      |
 
 #@doNotDecompose
 #@wip
@@ -719,9 +713,7 @@ Feature: Network of Peers
 
  Examples: Consensus Options
      |          ComposeFile                       |   WaitTime   |
-#    |   docker-compose-4-consensus-classic.yml   |      60      |
      |   docker-compose-4-consensus-batch.yml     |      60      |
-#    |   docker-compose-4-consensus-sieve.yml     |      60      |
 
      #@doNotDecompose
      #@wip
@@ -763,9 +755,7 @@ Feature: Network of Peers
 
       Examples: Consensus Options
           |                                  ComposeFile                                               |   WaitTime   |
-#          |   docker-compose-4-consensus-classic.yml  docker-compose-4-consensus-vp3-byzantine.yml     |      60      |
           |   docker-compose-4-consensus-batch.yml    docker-compose-4-consensus-vp3-byzantine.yml     |      60      |
-#          |   docker-compose-4-consensus-sieve.yml    docker-compose-4-consensus-vp3-byzantine.yml     |      60      |
 
 
   #@doNotDecompose
@@ -861,9 +851,7 @@ Feature: Network of Peers
 
     Examples: Consensus Options
         |          ComposeFile                       |   WaitTime   |
-#       |   docker-compose-4-consensus-classic.yml   |      60      |
         |   docker-compose-4-consensus-batch.yml     |      60      |
-        #|   docker-compose-4-consensus-sieve.yml     |      60      | // TODO, this is known to be broken, pending a fix
 
 
 
@@ -935,7 +923,6 @@ Feature: Network of Peers
 
     Examples: Consensus Options
         |          ComposeFile                       |   WaitTime   |
-#       |   docker-compose-4-consensus-classic.yml   |      60      |
         |   docker-compose-4-consensus-batch.yml     |      60      |
 
 #    @doNotDecompose
@@ -1030,9 +1017,7 @@ Feature: Network of Peers
                | vp1 | vp2 | vp3 |
             Examples: Consensus Options
                |          ComposeFile                       |   WaitTime   |
-              #    |   docker-compose-4-consensus-classic.yml   |      60      |
                |   docker-compose-4-consensus-batch.yml     |      60      |
-              #    |   docker-compose-4-consensus-sieve.yml     |      60
 
   #@doNotDecompose
   #@wip