Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-2946] remove dead parameter #1825

Merged
merged 1 commit into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ public static ProtocolSpecBuilder<Void> frontierDefinition(
.blockProcessorBuilder(MainnetBlockProcessor::new)
.blockValidatorBuilder(MainnetBlockValidator::new)
.blockImporterBuilder(MainnetBlockImporter::new)
.transactionReceiptType(TransactionReceiptType.ROOT)
.blockHeaderFunctions(new MainnetBlockHeaderFunctions())
.miningBeneficiaryCalculator(BlockHeader::getCoinbase)
.name("Frontier");
Expand Down Expand Up @@ -260,7 +259,6 @@ public static ProtocolSpecBuilder<Void> byzantiumDefinition(
? MainnetProtocolSpecs::byzantiumTransactionReceiptFactoryWithReasonEnabled
: MainnetProtocolSpecs::byzantiumTransactionReceiptFactory)
.blockReward(BYZANTIUM_BLOCK_REWARD)
.transactionReceiptType(TransactionReceiptType.STATUS)
.name("Byzantium");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public class ProtocolSpec<C> {
* @param transactionReceiptFactory the transactionReceiptFactory to use
* @param difficultyCalculator the difficultyCalculator to use
* @param blockReward the blockReward to use.
* @param transactionReceiptType the type of transaction receipt to use, one of
* @param miningBeneficiaryCalculator determines to whom mining proceeds are paid
* @param precompileContractRegistry all the pre-compiled contracts added
* @param skipZeroBlockRewards should rewards be skipped if it is zero
Expand All @@ -93,7 +92,6 @@ public ProtocolSpec(
final TransactionReceiptFactory transactionReceiptFactory,
final DifficultyCalculator<C> difficultyCalculator,
final Wei blockReward,
final TransactionReceiptType transactionReceiptType,
final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
final PrecompileContractRegistry precompileContractRegistry,
final boolean skipZeroBlockRewards) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public class ProtocolSpecBuilder<T> {
private BlockProcessorBuilder blockProcessorBuilder;
private BlockValidatorBuilder<T> blockValidatorBuilder;
private BlockImporterBuilder<T> blockImporterBuilder;
private TransactionReceiptType transactionReceiptType;
private String name;
private MiningBeneficiaryCalculator miningBeneficiaryCalculator;
private PrivacyParameters privacyParameters;
Expand Down Expand Up @@ -192,12 +191,6 @@ public ProtocolSpecBuilder<T> blockValidatorBuilder(
return this;
}

public ProtocolSpecBuilder<T> transactionReceiptType(
final TransactionReceiptType transactionReceiptType) {
this.transactionReceiptType = transactionReceiptType;
return this;
}

public ProtocolSpecBuilder<T> miningBeneficiaryCalculator(
final MiningBeneficiaryCalculator miningBeneficiaryCalculator) {
this.miningBeneficiaryCalculator = miningBeneficiaryCalculator;
Expand Down Expand Up @@ -243,7 +236,6 @@ public <R> ProtocolSpecBuilder<R> changeConsensusContextType(
.skipZeroBlockRewards(skipZeroBlockRewards)
.difficultyCalculator(difficultyCalculator)
.transactionReceiptFactory(transactionReceiptFactory)
.transactionReceiptType(transactionReceiptType)
.miningBeneficiaryCalculator(miningBeneficiaryCalculator)
.name(name);
}
Expand All @@ -267,7 +259,6 @@ public ProtocolSpec<T> build(final ProtocolSchedule<T> protocolSchedule) {
checkNotNull(blockReward, "Missing block reward");
checkNotNull(difficultyCalculator, "Missing difficulty calculator");
checkNotNull(transactionReceiptFactory, "Missing transaction receipt factory");
checkNotNull(transactionReceiptType, "Missing transaction receipt type");
checkNotNull(name, "Missing name");
checkNotNull(miningBeneficiaryCalculator, "Missing Mining Beneficiary Calculator");
checkNotNull(protocolSchedule, "Missing protocol schedule");
Expand Down Expand Up @@ -338,7 +329,6 @@ public ProtocolSpec<T> build(final ProtocolSchedule<T> protocolSchedule) {
transactionReceiptFactory,
difficultyCalculator,
blockReward,
transactionReceiptType,
miningBeneficiaryCalculator,
precompileContractRegistry,
skipZeroBlockRewards);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import tech.pegasys.pantheon.ethereum.jsonrpc.internal.results.TransactionReceiptStatusResult;
import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSpec;
import tech.pegasys.pantheon.ethereum.mainnet.TransactionReceiptType;
import tech.pegasys.pantheon.util.bytes.BytesValue;

import java.math.BigInteger;
Expand Down Expand Up @@ -90,7 +89,6 @@ public class EthGetTransactionReceiptTest {
null,
null,
null,
TransactionReceiptType.ROOT,
BlockHeader::getCoinbase,
null,
false);
Expand All @@ -110,7 +108,6 @@ public class EthGetTransactionReceiptTest {
null,
null,
null,
TransactionReceiptType.STATUS,
BlockHeader::getCoinbase,
null,
false);
Expand Down