mirror of https://github.com/hyperledger/besu
Fixing up acceptance test (#324)
* Refactoring and removing the duplicate call to web3j * Single shared variable for the private key for the first genesis account
CJ Hare
6 years ago
committed by
GitHub
parent
0421e344cd
commit
86d2590337
@ -1,44 +0,0 @@ |
||||
/* |
||||
* Copyright 2018 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. |
||||
*/ |
||||
package tech.pegasys.pantheon.tests.acceptance.dsl.condition.eth; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
import tech.pegasys.pantheon.tests.acceptance.dsl.condition.Condition; |
||||
import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node; |
||||
import tech.pegasys.pantheon.tests.acceptance.dsl.transaction.eth.EthGetTransactionReceiptTransaction; |
||||
|
||||
import java.util.Optional; |
||||
|
||||
import org.web3j.protocol.core.methods.response.TransactionReceipt; |
||||
|
||||
public class EthGetTransactionReceiptEquals implements Condition { |
||||
|
||||
private final EthGetTransactionReceiptTransaction transaction; |
||||
private final TransactionReceipt expectedReceipt; |
||||
|
||||
public EthGetTransactionReceiptEquals( |
||||
final EthGetTransactionReceiptTransaction transaction, |
||||
final TransactionReceipt expectedReceipt) { |
||||
this.transaction = transaction; |
||||
this.expectedReceipt = expectedReceipt; |
||||
} |
||||
|
||||
@Override |
||||
public void verify(final Node node) { |
||||
final Optional<TransactionReceipt> response = node.execute(transaction); |
||||
|
||||
assertThat(response.isPresent()).isTrue(); |
||||
assertThat(response.get()).isEqualTo(expectedReceipt); |
||||
} |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
/* |
||||
* Copyright 2018 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. |
||||
*/ |
||||
package tech.pegasys.pantheon.tests.acceptance.dsl.contract; |
||||
|
||||
import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; |
||||
|
||||
public class ContractVerifier { |
||||
|
||||
private final Account sender; |
||||
|
||||
public ContractVerifier(final Account sender) { |
||||
this.sender = sender; |
||||
} |
||||
|
||||
public ExpectValidTransactionReceipt validTransactionReceipt(final String contractAddress) { |
||||
return new ExpectValidTransactionReceipt(sender, contractAddress); |
||||
} |
||||
} |
||||
@ -0,0 +1,74 @@ |
||||
/* |
||||
* Copyright 2018 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. |
||||
*/ |
||||
package tech.pegasys.pantheon.tests.acceptance.dsl.contract; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
|
||||
import tech.pegasys.pantheon.tests.acceptance.dsl.account.Account; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.util.Optional; |
||||
|
||||
import org.web3j.protocol.core.methods.response.TransactionReceipt; |
||||
import org.web3j.tx.Contract; |
||||
|
||||
public class ExpectValidTransactionReceipt { |
||||
|
||||
private final String senderAddress; |
||||
private final String contractAddress; |
||||
|
||||
public ExpectValidTransactionReceipt(final Account sender, final String contractAddress) { |
||||
this.contractAddress = contractAddress; |
||||
this.senderAddress = sender.getAddress(); |
||||
} |
||||
|
||||
public void verify(final Contract contract) { |
||||
|
||||
assertThat(contract).isNotNull(); |
||||
final Optional<TransactionReceipt> receipt = contract.getTransactionReceipt(); |
||||
|
||||
// We're expecting a receipt
|
||||
assertThat(receipt).isNotNull(); |
||||
assertThat(receipt.isPresent()).isTrue(); |
||||
final TransactionReceipt transactionReceipt = receipt.get(); |
||||
|
||||
// Contract transaction has no 'to' address or contract address
|
||||
assertThat(transactionReceipt.getTo()).isNull(); |
||||
assertThat(transactionReceipt.getRoot()).isNull(); |
||||
|
||||
// Variables outside the control of the test :. just check existence
|
||||
assertThat(transactionReceipt.getBlockHash()).isNotBlank(); |
||||
assertThat(transactionReceipt.getTransactionHash()).isNotBlank(); |
||||
assertThat(transactionReceipt.getTransactionIndex()).isNotNull(); |
||||
assertThat(transactionReceipt.getTransactionHash()).isNotNull(); |
||||
|
||||
// Block zero is the genesis, expecting anytime after then
|
||||
assertThat(transactionReceipt.getBlockNumber()).isGreaterThanOrEqualTo(BigInteger.ONE); |
||||
|
||||
// Address generation is deterministic, based on the sender address and the transaction nonce
|
||||
assertThat(transactionReceipt.getContractAddress()).isEqualTo(contractAddress); |
||||
|
||||
// Expecting successful transaction (status '0x1')
|
||||
assertThat(transactionReceipt.getStatus()).isEqualTo("0x1"); |
||||
|
||||
// Address for the account that signed (and paid) for the contract deployment transaction
|
||||
assertThat(transactionReceipt.getFrom()).isEqualTo(senderAddress); |
||||
|
||||
// No logs from expected from the contract deployment
|
||||
assertThat(transactionReceipt.getLogs()).isNotNull(); |
||||
assertThat(transactionReceipt.getLogs().size()).isEqualTo(0); |
||||
assertThat(transactionReceipt.getLogsBloom()) |
||||
.isEqualTo( |
||||
"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue