AT DSL - Renaming ibft to ibft2 (#1516)

Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java

@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft;
+package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor;

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java

@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft;
+package tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static tech.pegasys.pantheon.tests.acceptance.dsl.WaitUtils.waitFor;

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/jsonrpc/Ibft2.java

@@ -14,8 +14,8 @@ package tech.pegasys.pantheon.tests.acceptance.dsl.jsonrpc;
 
 import tech.pegasys.pantheon.ethereum.core.Address;
 import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition;
-import tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft.ExpectProposals;
-import tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft.ExpectValidators;
+import tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2.ExpectProposals;
+import tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2.ExpectValidators;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode;
 import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
 
@@ -83,7 +83,7 @@ public class Ibft2 {
       final Map<Address, Boolean> proposalsAsAddress =
           this.proposals.entrySet().stream()
               .collect(Collectors.toMap(p -> p.getKey().getAddress(), Entry::getValue));
-      return new tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft.ExpectProposals(
+      return new tech.pegasys.pantheon.tests.acceptance.dsl.condition.ibft2.ExpectProposals(
           ibft, proposalsAsAddress);
     }
   }