mirror of https://github.com/hyperledger/besu
Allow BFT tests to be parameterized (#1877)
Signed-off-by: Trent Mohay <trent.mohay@consensys.net>pull/1893/head
parent
c63e9192f3
commit
327ba1e977
@ -0,0 +1,30 @@ |
||||
/* |
||||
* Copyright ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* 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. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft; |
||||
|
||||
public enum ConsensusType { |
||||
QBFT("qbft"), |
||||
IBFT2("ibft"); |
||||
|
||||
private final String name; |
||||
|
||||
ConsensusType(final String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
} |
@ -0,0 +1,66 @@ |
||||
/* |
||||
* Copyright 2020 ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* 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. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.tests.acceptance.bft; |
||||
|
||||
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; |
||||
import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory; |
||||
|
||||
import java.util.List; |
||||
|
||||
public class BftAcceptanceTestParameterization { |
||||
|
||||
public static List<Object[]> FACTORIES = |
||||
List.of( |
||||
new Object[] { |
||||
"ibft", |
||||
new BftAcceptanceTestParameterization( |
||||
BesuNodeFactory::createIbft2Node, BesuNodeFactory::createIbft2NodeWithValidators) |
||||
}, |
||||
new Object[] { |
||||
"qbft", |
||||
new BftAcceptanceTestParameterization( |
||||
BesuNodeFactory::createQbftNode, BesuNodeFactory::createQbftNodeWithValidators) |
||||
}); |
||||
|
||||
@FunctionalInterface |
||||
public interface NodeCreator { |
||||
|
||||
BesuNode create(BesuNodeFactory factory, String name) throws Exception; |
||||
} |
||||
|
||||
@FunctionalInterface |
||||
public interface NodeWithValidatorsCreator { |
||||
|
||||
BesuNode create(BesuNodeFactory factory, String name, String[] validators) throws Exception; |
||||
} |
||||
|
||||
private final NodeCreator creatorFn; |
||||
private final NodeWithValidatorsCreator createorWithValidatorFn; |
||||
|
||||
public BftAcceptanceTestParameterization( |
||||
final NodeCreator creatorFn, final NodeWithValidatorsCreator createorWithValidatorFn) { |
||||
this.creatorFn = creatorFn; |
||||
this.createorWithValidatorFn = createorWithValidatorFn; |
||||
} |
||||
|
||||
public BesuNode createNode(BesuNodeFactory factory, String name) throws Exception { |
||||
return creatorFn.create(factory, name); |
||||
} |
||||
|
||||
public BesuNode createNodeWithValidators( |
||||
BesuNodeFactory factory, String name, String[] validators) throws Exception { |
||||
return createorWithValidatorFn.create(factory, name, validators); |
||||
} |
||||
} |
@ -0,0 +1,41 @@ |
||||
/* |
||||
* Copyright 2020 ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* 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. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.tests.acceptance.bft; |
||||
|
||||
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; |
||||
|
||||
import java.util.Collection; |
||||
|
||||
import org.junit.Ignore; |
||||
import org.junit.runner.RunWith; |
||||
import org.junit.runners.Parameterized; |
||||
import org.junit.runners.Parameterized.Parameters; |
||||
|
||||
@RunWith(Parameterized.class) |
||||
@Ignore("This is not a test class, it offers BFT parameterization only.") |
||||
public abstract class ParameterizedBftTestBase extends AcceptanceTestBase { |
||||
|
||||
protected final BftAcceptanceTestParameterization nodeFactory; |
||||
|
||||
@Parameters(name = "{0}") |
||||
public static Collection<Object[]> factoryFunctions() { |
||||
return BftAcceptanceTestParameterization.FACTORIES; |
||||
} |
||||
|
||||
protected ParameterizedBftTestBase( |
||||
final String testname, final BftAcceptanceTestParameterization input) { |
||||
this.nodeFactory = input; |
||||
} |
||||
} |
@ -1,120 +0,0 @@ |
||||
/* |
||||
* Copyright ConsenSys AG. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* 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. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.tests.acceptance.qbft; |
||||
|
||||
import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase; |
||||
import org.hyperledger.besu.tests.acceptance.dsl.account.Account; |
||||
import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode; |
||||
|
||||
import java.io.IOException; |
||||
import java.util.List; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
public class QbftMiningAcceptanceTest extends AcceptanceTestBase { |
||||
|
||||
@Test |
||||
public void shouldMineOnSingleNode() throws IOException { |
||||
final BesuNode minerNode = besu.createQbftNode("miner1"); |
||||
cluster.start(minerNode); |
||||
|
||||
cluster.verify(blockchain.reachesHeight(minerNode, 1)); |
||||
|
||||
final Account sender = accounts.createAccount("account1"); |
||||
final Account receiver = accounts.createAccount("account2"); |
||||
|
||||
minerNode.execute(accountTransactions.createTransfer(sender, 50)); |
||||
cluster.verify(sender.balanceEquals(50)); |
||||
|
||||
minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1)); |
||||
cluster.verify(receiver.balanceEquals(1)); |
||||
|
||||
minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2)); |
||||
cluster.verify(receiver.balanceEquals(3)); |
||||
} |
||||
|
||||
@Test |
||||
public void shouldMineOnMultipleNodes() throws IOException { |
||||
final BesuNode minerNode1 = besu.createQbftNode("miner1"); |
||||
final BesuNode minerNode2 = besu.createQbftNode("miner2"); |
||||
final BesuNode minerNode3 = besu.createQbftNode("miner3"); |
||||
final BesuNode minerNode4 = besu.createQbftNode("miner4"); |
||||
cluster.start(minerNode1, minerNode2, minerNode3, minerNode4); |
||||
|
||||
cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85)); |
||||
|
||||
final Account sender = accounts.createAccount("account1"); |
||||
final Account receiver = accounts.createAccount("account2"); |
||||
|
||||
minerNode1.execute(accountTransactions.createTransfer(sender, 50)); |
||||
cluster.verify(sender.balanceEquals(50)); |
||||
|
||||
minerNode2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1)); |
||||
cluster.verify(receiver.balanceEquals(1)); |
||||
|
||||
minerNode3.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2)); |
||||
cluster.verify(receiver.balanceEquals(3)); |
||||
|
||||
minerNode4.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 3)); |
||||
cluster.verify(receiver.balanceEquals(6)); |
||||
} |
||||
|
||||
@Test |
||||
public void shouldMineOnMultipleNodesEvenWhenClusterContainsNonValidator() throws IOException { |
||||
final String[] validators = {"validator1", "validator2", "validator3"}; |
||||
final BesuNode validator1 = besu.createQbftNodeWithValidators("validator1", validators); |
||||
final BesuNode validator2 = besu.createQbftNodeWithValidators("validator2", validators); |
||||
final BesuNode validator3 = besu.createQbftNodeWithValidators("validator3", validators); |
||||
final BesuNode nonValidatorNode = |
||||
besu.createQbftNodeWithValidators("non-validator", validators); |
||||
cluster.start(validator1, validator2, validator3, nonValidatorNode); |
||||
|
||||
cluster.verify(blockchain.reachesHeight(validator1, 1, 85)); |
||||
|
||||
final Account sender = accounts.createAccount("account1"); |
||||
final Account receiver = accounts.createAccount("account2"); |
||||
|
||||
validator1.execute(accountTransactions.createTransfer(sender, 50)); |
||||
cluster.verify(sender.balanceEquals(50)); |
||||
|
||||
validator2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1)); |
||||
cluster.verify(receiver.balanceEquals(1)); |
||||
|
||||
nonValidatorNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2)); |
||||
cluster.verify(receiver.balanceEquals(3)); |
||||
} |
||||
|
||||
@Test |
||||
public void shouldStillMineWhenANonProposerNodeFailsAndHasSufficientValidators() |
||||
throws IOException { |
||||
final BesuNode minerNode1 = besu.createQbftNode("miner1"); |
||||
final BesuNode minerNode2 = besu.createQbftNode("miner2"); |
||||
final BesuNode minerNode3 = besu.createQbftNode("miner3"); |
||||
final BesuNode minerNode4 = besu.createQbftNode("miner4"); |
||||
final List<BesuNode> validators = |
||||
ibftTwo.validators(new BesuNode[] {minerNode1, minerNode2, minerNode3, minerNode4}); |
||||
final BesuNode nonProposerNode = validators.get(validators.size() - 1); |
||||
cluster.start(validators); |
||||
|
||||
cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85)); |
||||
|
||||
final Account receiver = accounts.createAccount("account2"); |
||||
|
||||
cluster.stopNode(nonProposerNode); |
||||
validators.get(0).execute(accountTransactions.createTransfer(receiver, 80)); |
||||
|
||||
cluster.verifyOnActiveNodes(receiver.balanceEquals(80)); |
||||
} |
||||
} |
Loading…
Reference in new issue