mirror of https://github.com/hyperledger/besu
Use PendingTransaction in BlockTransactionSelector (#5966)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>pull/5974/head
Fabio Di Fabio
1 year ago
committed by
GitHub
parent
dc47867054
commit
987d33c63a
@ -0,0 +1,39 @@ |
|||||||
|
/* |
||||||
|
* Copyright Hyperledger Besu Contributors. |
||||||
|
* |
||||||
|
* 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.datatypes; |
||||||
|
|
||||||
|
/** Represent a transaction that has not confirmed yet, and stays in the transaction pool */ |
||||||
|
public interface PendingTransaction { |
||||||
|
/** |
||||||
|
* Get the underlying transaction |
||||||
|
* |
||||||
|
* @return the underlying transaction |
||||||
|
*/ |
||||||
|
Transaction getTransaction(); |
||||||
|
|
||||||
|
/** |
||||||
|
* Has this transaction been received from the RPC API? |
||||||
|
* |
||||||
|
* @return true if it is a local sent transaction |
||||||
|
*/ |
||||||
|
boolean isReceivedFromLocalSource(); |
||||||
|
|
||||||
|
/** |
||||||
|
* Timestamp in millisecond when this transaction has been added to the pool |
||||||
|
* |
||||||
|
* @return timestamp |
||||||
|
*/ |
||||||
|
long getAddedAt(); |
||||||
|
} |
||||||
@ -1,73 +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.ethereum.core; |
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat; |
|
||||||
|
|
||||||
import org.hyperledger.besu.crypto.KeyPair; |
|
||||||
import org.hyperledger.besu.crypto.SignatureAlgorithmFactory; |
|
||||||
|
|
||||||
import java.util.stream.Stream; |
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test; |
|
||||||
|
|
||||||
public class AccountTransactionOrderTest { |
|
||||||
|
|
||||||
private static final KeyPair KEYS = SignatureAlgorithmFactory.getInstance().generateKeyPair(); |
|
||||||
|
|
||||||
private final Transaction transaction1 = transaction(1); |
|
||||||
private final Transaction transaction2 = transaction(2); |
|
||||||
private final Transaction transaction3 = transaction(3); |
|
||||||
private final Transaction transaction4 = transaction(4); |
|
||||||
private final AccountTransactionOrder accountTransactionOrder = |
|
||||||
new AccountTransactionOrder( |
|
||||||
Stream.of(transaction1, transaction2, transaction3, transaction4)); |
|
||||||
|
|
||||||
@Test |
|
||||||
public void shouldProcessATransactionImmediatelyIfItsTheLowestNonce() { |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction1)) |
|
||||||
.containsExactly(transaction1); |
|
||||||
} |
|
||||||
|
|
||||||
@Test |
|
||||||
public void shouldDeferProcessingATransactionIfItIsNotTheLowestNonce() { |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction2)).isEmpty(); |
|
||||||
} |
|
||||||
|
|
||||||
@Test |
|
||||||
public void shouldProcessDeferredTransactionsAfterPrerequisiteIsProcessed() { |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction2)).isEmpty(); |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction3)).isEmpty(); |
|
||||||
|
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction1)) |
|
||||||
.containsExactly(transaction1, transaction2, transaction3); |
|
||||||
} |
|
||||||
|
|
||||||
@Test |
|
||||||
public void shouldNotProcessDeferredTransactionsThatAreNotYetDue() { |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction2)).isEmpty(); |
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction4)).isEmpty(); |
|
||||||
|
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction1)) |
|
||||||
.containsExactly(transaction1, transaction2); |
|
||||||
|
|
||||||
assertThat(accountTransactionOrder.transactionsToProcess(transaction3)) |
|
||||||
.containsExactly(transaction3, transaction4); |
|
||||||
} |
|
||||||
|
|
||||||
private Transaction transaction(final int nonce) { |
|
||||||
return new TransactionTestFixture().nonce(nonce).createTransaction(KEYS); |
|
||||||
} |
|
||||||
} |
|
||||||
@ -0,0 +1,75 @@ |
|||||||
|
/* |
||||||
|
* 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.ethereum.eth.transactions.sorter; |
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat; |
||||||
|
|
||||||
|
import org.hyperledger.besu.crypto.KeyPair; |
||||||
|
import org.hyperledger.besu.crypto.SignatureAlgorithmFactory; |
||||||
|
import org.hyperledger.besu.ethereum.core.Transaction; |
||||||
|
import org.hyperledger.besu.ethereum.core.TransactionTestFixture; |
||||||
|
import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction; |
||||||
|
|
||||||
|
import java.util.stream.Stream; |
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test; |
||||||
|
|
||||||
|
public class AccountTransactionOrderTest { |
||||||
|
|
||||||
|
private static final KeyPair KEYS = SignatureAlgorithmFactory.getInstance().generateKeyPair(); |
||||||
|
|
||||||
|
private final PendingTransaction pendingTx1 = new PendingTransaction.Remote((transaction(1))); |
||||||
|
private final PendingTransaction pendingTx2 = new PendingTransaction.Remote((transaction(2))); |
||||||
|
private final PendingTransaction pendingTx3 = new PendingTransaction.Remote((transaction(3))); |
||||||
|
private final PendingTransaction pendingTx4 = new PendingTransaction.Remote((transaction(4))); |
||||||
|
private final AccountTransactionOrder accountTransactionOrder = |
||||||
|
new AccountTransactionOrder(Stream.of(pendingTx1, pendingTx2, pendingTx3, pendingTx4)); |
||||||
|
|
||||||
|
@Test |
||||||
|
public void shouldProcessATransactionImmediatelyIfItsTheLowestNonce() { |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx1)) |
||||||
|
.containsExactly(pendingTx1); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void shouldDeferProcessingATransactionIfItIsNotTheLowestNonce() { |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx2)).isEmpty(); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void shouldProcessDeferredTransactionsAfterPrerequisiteIsProcessed() { |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx2)).isEmpty(); |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx3)).isEmpty(); |
||||||
|
|
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx1)) |
||||||
|
.containsExactly(pendingTx1, pendingTx2, pendingTx3); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void shouldNotProcessDeferredTransactionsThatAreNotYetDue() { |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx2)).isEmpty(); |
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx4)).isEmpty(); |
||||||
|
|
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx1)) |
||||||
|
.containsExactly(pendingTx1, pendingTx2); |
||||||
|
|
||||||
|
assertThat(accountTransactionOrder.transactionsToProcess(pendingTx3)) |
||||||
|
.containsExactly(pendingTx3, pendingTx4); |
||||||
|
} |
||||||
|
|
||||||
|
private Transaction transaction(final int nonce) { |
||||||
|
return new TransactionTestFixture().nonce(nonce).createTransaction(KEYS); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue