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

PIE-1689: Fix behaviour for absent account permissiong smart contract #1569

Merged
merged 2 commits into from
Jun 17, 2019
Merged

PIE-1689: Fix behaviour for absent account permissiong smart contract #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97af0c9
PIE-1689: Fix behaviour for absent account permissiong smart contract
lucassaldanha Jun 17, 2019
09d8983
Update warning
lucassaldanha Jun 17, 2019
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
6 changes: 5 additions & 1 deletion ...asys/pantheon/ethereum/permissioning/TransactionSmartContractPermissioningController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ public boolean isPermitted(final Transaction transaction) {
transactionSimulator.doesAddressExistAtHead(contractAddress);

if (contractExists.isPresent() && !contractExists.get()) {
throw new IllegalStateException("Transaction permissioning contract does not exist");
this.checkCounterPermitted.inc();
LOG.warn(
"Account permissioning smart contract not found at address {} in current head block. Any transaction will be allowed.",
contractAddress);
return true;
}

final Optional<TransactionSimulatorResult> result =
Expand Down
8 changes: 3 additions & 5 deletions .../pantheon/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,10 @@ public void testPermissioningContractMissing() throws IOException {

verifyCountersUntouched();

assertThatThrownBy(
() -> controller.isPermitted(transactionForAccount(Address.fromHexString("0x1"))))
.isInstanceOf(IllegalStateException.class)
.hasMessage("Transaction permissioning contract does not exist");
assertThat(controller.isPermitted(transactionForAccount(Address.fromHexString("0x1"))))
.isTrue();

verifyCountersFailedCheck();
verifyCountersPermitted();
}

@Test
Expand Down