From 63e95d9e8a695f56b70270bc7d9bdf69b7bf1fb3 Mon Sep 17 00:00:00 2001
From: Otniel Nicola <otniel@axlabs.com>
Date: Mon, 16 Dec 2024 11:11:05 +0200
Subject: [PATCH] Apply changes to formatting

---
 .idea/codeStyles/Project.xml                  |  11 +-
 .../axlabs/neo/grantshares/DeployConfig.java  |   6 +-
 .../axlabs/neo/grantshares/Deployment.java    |   9 +-
 .../axlabs/neo/grantshares/Invocations.java   |   9 +-
 .../neo/grantshares/GrantSharesGov.java       | 133 ++++++++------
 .../neo/grantshares/GrantSharesTreasury.java  |  23 ++-
 .../grantshares/GovernanceMembersTest.java    |  44 +++--
 .../grantshares/GovernanceParametersTest.java |  23 ++-
 .../neo/grantshares/GrantSharesGovTest.java   | 171 ++++++++++++------
 .../grantshares/GrantSharesTreasuryTest.java  | 117 ++++++++----
 .../grantshares/ProposalExecutionsTest.java   |  75 +++++---
 .../neo/grantshares/TreasuryMultiSigTest.java |  14 +-
 .../util/GrantSharesGovContract.java          |   9 +-
 .../util/GrantSharesTreasuryContract.java     |   5 +-
 .../neo/grantshares/util/IntentParam.java     |   6 +-
 .../neo/grantshares/util/ProposalStruct.java  |   3 +-
 .../neo/grantshares/util/TestHelper.java      |  14 +-
 17 files changed, 440 insertions(+), 232 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7ac15c5..bdde1d6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,9 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
-      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+      <option name="ENUM_FIELD_ANNOTATION_WRAP" value="1" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="RECORD_COMPONENTS_WRAP" value="0" />
@@ -16,7 +16,7 @@
       <option name="WHILE_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
       <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="RESOURCE_LIST_WRAP" value="1" />
       <option name="THROWS_LIST_WRAP" value="1" />
       <option name="THROWS_KEYWORD_WRAP" value="1" />
@@ -24,14 +24,13 @@
       <option name="BINARY_OPERATION_WRAP" value="1" />
       <option name="ARRAY_INITIALIZER_WRAP" value="1" />
       <option name="ASSERT_STATEMENT_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="0" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
       <option name="WRAP_LONG_LINES" value="true" />
-      <option name="PARAMETER_ANNOTATION_WRAP" value="2" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
       <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
-      <option name="WRAP_ON_TYPING" value="1" />
+      <option name="WRAP_ON_TYPING" value="0" />
       <option name="SOFT_MARGINS" value="120" />
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
diff --git a/src/deploy/java/com/axlabs/neo/grantshares/DeployConfig.java b/src/deploy/java/com/axlabs/neo/grantshares/DeployConfig.java
index e0014eb..60d1738 100644
--- a/src/deploy/java/com/axlabs/neo/grantshares/DeployConfig.java
+++ b/src/deploy/java/com/axlabs/neo/grantshares/DeployConfig.java
@@ -54,7 +54,8 @@ static ContractParameter getGovDeployConfig() {
                         MIN_ACCEPTANCE_RATE_KEY, Config.getIntProperty(MIN_ACCEPTANCE_RATE_KEY),
                         MIN_QUORUM_KEY, Config.getIntProperty(MIN_QUORUM_KEY),
                         THRESHOLD_KEY, Config.getIntProperty(THRESHOLD_KEY)
-                ));
+                )
+        );
     }
 
     /**
@@ -94,6 +95,7 @@ static ContractParameter getTreasuryDeployConfig(Hash160 grantSharesGovHash) {
                 hash160(grantSharesGovHash),
                 fundersParam,
                 map(tokens),
-                Config.getIntProperty(THRESHOLD_KEY));
+                Config.getIntProperty(THRESHOLD_KEY)
+        );
     }
 }
diff --git a/src/deploy/java/com/axlabs/neo/grantshares/Deployment.java b/src/deploy/java/com/axlabs/neo/grantshares/Deployment.java
index 798928d..9cbf295 100644
--- a/src/deploy/java/com/axlabs/neo/grantshares/Deployment.java
+++ b/src/deploy/java/com/axlabs/neo/grantshares/Deployment.java
@@ -41,7 +41,8 @@ private static Hash160 deployGrantSharesGov(AccountSigner signer) throws Throwab
                     "error message: " + log.getExecutions().get(0).getException());
         }
         Hash160 contractHash = SmartContract.calcContractHash(signer.getScriptHash(),
-                res.getNefFile().getCheckSumAsInteger(), res.getManifest().getName());
+                res.getNefFile().getCheckSumAsInteger(), res.getManifest().getName()
+        );
         System.out.println("GrantSharesGov Contract Hash: " + contractHash);
         return contractHash;
     }
@@ -50,7 +51,8 @@ private static void deployGrantSharesTreasury(Hash160 grantSharesGovHash, Accoun
         CompilationUnit res = new Compiler().compile(GrantSharesTreasury.class.getCanonicalName());
         TransactionBuilder builder = new ContractManagement(getNeow3j())
                 .deploy(res.getNefFile(), res.getManifest(),
-                        DeployConfig.getTreasuryDeployConfig(grantSharesGovHash))
+                        DeployConfig.getTreasuryDeployConfig(grantSharesGovHash)
+                )
                 .signers(signer);
 
         Hash256 txHash = builder.sign().send().getSendRawTransaction().getHash();
@@ -63,7 +65,8 @@ private static void deployGrantSharesTreasury(Hash160 grantSharesGovHash, Accoun
                     "error message: " + log.getExecutions().get(0).getException());
         }
         Hash160 contractHash = SmartContract.calcContractHash(signer.getScriptHash(),
-                res.getNefFile().getCheckSumAsInteger(), res.getManifest().getName());
+                res.getNefFile().getCheckSumAsInteger(), res.getManifest().getName()
+        );
         System.out.println("GrantSharesTreasury Contract Hash: " + contractHash);
 
     }
diff --git a/src/deploy/java/com/axlabs/neo/grantshares/Invocations.java b/src/deploy/java/com/axlabs/neo/grantshares/Invocations.java
index 5e8bb4f..a9d257e 100644
--- a/src/deploy/java/com/axlabs/neo/grantshares/Invocations.java
+++ b/src/deploy/java/com/axlabs/neo/grantshares/Invocations.java
@@ -61,12 +61,15 @@ private static void endorseProposal(GrantSharesGovContract gov, Account a, int i
         System.out.println(txHash.toString());
     }
 
-    static void createProposal(GrantSharesTreasuryContract treasury, GrantSharesGovContract gov, Account a) throws Throwable {
+    static void createProposal(GrantSharesTreasuryContract treasury, GrantSharesGovContract gov, Account a)
+            throws Throwable {
         IntentParam intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), NeoToken.SCRIPT_HASH,
-                a.getScriptHash(), BigInteger.ONE);
+                a.getScriptHash(), BigInteger.ONE
+        );
         NeoApplicationLog.Execution exec = signSendAwait(
                 gov.createProposal(a.getScriptHash(), "https://github.com/axlabs/grantshares-dev/issues/42", -1,
-                        intent), a);
+                        intent
+                ), a);
     }
 
     static NeoApplicationLog.Execution signSendAwait(TransactionBuilder b, Account signer) throws Throwable {
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
index c8fd6b9..301b506 100644
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
+++ b/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
@@ -1,9 +1,25 @@
 package com.axlabs.neo.grantshares;
 
-import io.neow3j.devpack.*;
+import io.neow3j.devpack.Account;
+import io.neow3j.devpack.ByteString;
+import io.neow3j.devpack.Contract;
+import io.neow3j.devpack.ECPoint;
+import io.neow3j.devpack.Hash160;
+import io.neow3j.devpack.Helper;
+import io.neow3j.devpack.Iterator;
+import io.neow3j.devpack.List;
+import io.neow3j.devpack.Map;
 import io.neow3j.devpack.Runtime;
 import io.neow3j.devpack.Iterator.Struct;
-import io.neow3j.devpack.annotations.*;
+import io.neow3j.devpack.Storage;
+import io.neow3j.devpack.StorageContext;
+import io.neow3j.devpack.StorageMap;
+import io.neow3j.devpack.annotations.ContractSourceCode;
+import io.neow3j.devpack.annotations.DisplayName;
+import io.neow3j.devpack.annotations.ManifestExtra;
+import io.neow3j.devpack.annotations.OnDeployment;
+import io.neow3j.devpack.annotations.Permission;
+import io.neow3j.devpack.annotations.Safe;
 import io.neow3j.devpack.constants.FindOptions;
 import io.neow3j.devpack.contracts.ContractManagement;
 import io.neow3j.devpack.contracts.StdLib;
@@ -20,7 +36,9 @@
 @ManifestExtra(key = "Email", value = "info@grantshares.io")
 @ManifestExtra(key = "Description", value = "The governing contract of the GrantShares DAO")
 @ManifestExtra(key = "Website", value = "https://grantshares.io")
+//@formatter:off
 @ContractSourceCode("https://github.com/AxLabs/grantshares-contracts/blob/main/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java")
+//@formatter:on
 @DisplayName("GrantSharesGov")
 @SuppressWarnings("unchecked")
 public class GrantSharesGov {
@@ -240,10 +258,8 @@ public static int getProposalCount() {
      */
     @Safe
     public static Paginator.Paginated getProposals(int page, int itemsPerPage) throws Exception {
-        if (page < 0)
-            throw new Exception("[GrantSharesGov.getProposals] Page number was negative");
-        if (itemsPerPage <= 0)
-            throw new Exception("[GrantSharesGov.getProposals] Page number was negative or zero");
+        if (page < 0) throw new Exception("[GrantSharesGov.getProposals] Page number was negative");
+        if (itemsPerPage <= 0) throw new Exception("[GrantSharesGov.getProposals] Page number was negative or zero");
         int n = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
         int[] pagination = Paginator.calcPagination(n, page, itemsPerPage);
         List<Object> list = new List<>();
@@ -291,8 +307,9 @@ public static int calcMembersMultiSigAccountThreshold() throws Exception {
         if (thresholdTimes100 % 100 != 0) {
             threshold += 1; // Always round up.
         }
-        if (threshold == 0)
+        if (threshold == 0) {
             throw new Exception("[GrantSharesGov.calcMembersMultiSigAccountThreshold] Threshold was zero");
+        }
         return threshold;
     }
 
@@ -310,8 +327,8 @@ public static int calcMembersMultiSigAccountThreshold() throws Exception {
      */
     public static int createProposal(Hash160 proposer, Intent[] intents, String offchainUri, int linkedProposal) {
         return createProposal(proposer, intents, offchainUri, linkedProposal,
-                parameters.getInt(MIN_ACCEPTANCE_RATE_KEY),
-                parameters.getInt(MIN_QUORUM_KEY));
+                parameters.getInt(MIN_ACCEPTANCE_RATE_KEY), parameters.getInt(MIN_QUORUM_KEY)
+        );
     }
 
     /**
@@ -326,22 +343,26 @@ public static int createProposal(Hash160 proposer, Intent[] intents, String offc
      * @return The id of the proposal.
      */
     public static int createProposal(Hash160 proposer, Intent[] intents, String offchainUri, int linkedProposal,
-                                     int acceptanceRate, int quorum) {
+            int acceptanceRate, int quorum) {
 
-        if (!checkWitness(proposer)) Helper.abort("createProposal" + ": " +  "Not authorised");
-        if (acceptanceRate < parameters.getInt(MIN_ACCEPTANCE_RATE_KEY) || acceptanceRate > 100)
-            Helper.abort("createProposal" + ": " +  "Invalid acceptance rate");
-        if (quorum < parameters.getInt(MIN_QUORUM_KEY) || quorum > 100)
-            Helper.abort("createProposal" + ": " +  "Invalid quorum");
-        if (linkedProposal >= 0 && proposals.get(linkedProposal) == null)
-            Helper.abort("createProposal" + ": " +  "Linked proposal doesn't exist");
-        if (!areIntentsValid(intents)) Helper.abort("createProposal" + ": " +  "Invalid intents");
+        if (!checkWitness(proposer)) Helper.abort("createProposal" + ": " + "Not authorised");
+        if (acceptanceRate < parameters.getInt(MIN_ACCEPTANCE_RATE_KEY) || acceptanceRate > 100) {
+            Helper.abort("createProposal" + ": " + "Invalid acceptance rate");
+        }
+        if (quorum < parameters.getInt(MIN_QUORUM_KEY) || quorum > 100) {
+            Helper.abort("createProposal" + ": " + "Invalid quorum");
+        }
+        if (linkedProposal >= 0 && proposals.get(linkedProposal) == null) {
+            Helper.abort("createProposal" + ": " + "Linked proposal doesn't exist");
+        }
+        if (!areIntentsValid(intents)) Helper.abort("createProposal" + ": " + "Invalid intents");
 
         int id = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
         int expiration = parameters.getInt(EXPIRATION_LENGTH_KEY) + getTime();
         proposals.put(id, new StdLib().serialize(new Proposal(id, expiration)));
-        proposalData.put(id, new StdLib().serialize(new ProposalData(proposer, linkedProposal, acceptanceRate,
-                quorum, intents, offchainUri)));
+        proposalData.put(id, new StdLib().serialize(
+                new ProposalData(proposer, linkedProposal, acceptanceRate, quorum, intents, offchainUri))
+        );
         proposalVotes.put(id, new StdLib().serialize(new ProposalVotes()));
         Storage.put(ctx, PROPOSALS_COUNT_KEY, id + 1);
 
@@ -374,13 +395,14 @@ private static boolean areIntentsValid(Intent[] intents) {
      */
     public static void endorseProposal(int id, Hash160 endorser) {
         abortIfPaused();
-        if (members.get(endorser.toByteString()) == null || !checkWitness(endorser))
-            Helper.abort("endorseProposal" + ": " +  "Not authorised");
+        if (members.get(endorser.toByteString()) == null || !checkWitness(endorser)) {
+            Helper.abort("endorseProposal" + ": " + "Not authorised");
+        }
         ByteString proposalBytes = proposals.get(id);
-        if (proposalBytes == null) Helper.abort("endorseProposal" + ": " +  "Proposal doesn't exist");
+        if (proposalBytes == null) Helper.abort("endorseProposal" + ": " + "Proposal doesn't exist");
         Proposal proposal = (Proposal) new StdLib().deserialize(proposalBytes);
-        if (proposal.expiration <= getTime()) Helper.abort("endorseProposal" + ": " +  "Proposal expired");
-        if (proposal.endorser != null) Helper.abort("endorseProposal" + ": " +  "Proposal already endorsed");
+        if (proposal.expiration <= getTime()) Helper.abort("endorseProposal" + ": " + "Proposal expired");
+        if (proposal.endorser != null) Helper.abort("endorseProposal" + ": " + "Proposal already endorsed");
 
         proposal.endorser = endorser;
         proposal.reviewEnd = getTime() + parameters.getInt(REVIEW_LENGTH_KEY);
@@ -402,17 +424,19 @@ public static void endorseProposal(int id, Hash160 endorser) {
      */
     public static void vote(int id, int vote, Hash160 voter) {
         abortIfPaused();
-        if (vote < -1 || vote > 1) Helper.abort("vote" + ": " +  "Invalid vote");
-        if (members.get(voter.toByteString()) == null || !checkWitness(voter))
-            Helper.abort("vote" + ": " +  "Not authorised");
+        if (vote < -1 || vote > 1) Helper.abort("vote" + ": " + "Invalid vote");
+        if (members.get(voter.toByteString()) == null || !checkWitness(voter)) {
+            Helper.abort("vote" + ": " + "Not authorised");
+        }
         ByteString proposalBytes = proposals.get(id);
-        if (proposalBytes == null) Helper.abort("vote" + ": " +  "Proposal doesn't exist");
+        if (proposalBytes == null) Helper.abort("vote" + ": " + "Proposal doesn't exist");
         Proposal proposal = (Proposal) new StdLib().deserialize(proposalBytes);
         int time = getTime();
-        if (proposal.endorser == null || time < proposal.reviewEnd || time >= proposal.votingEnd)
-            Helper.abort("vote" + ": " +  "Proposal not active");
+        if (proposal.endorser == null || time < proposal.reviewEnd || time >= proposal.votingEnd) {
+            Helper.abort("vote" + ": " + "Proposal not active");
+        }
         ProposalVotes pv = (ProposalVotes) new StdLib().deserialize(proposalVotes.get(id));
-        if (pv.voters.containsKey(voter)) Helper.abort("vote" + ": " +  "Already voted on this proposal");
+        if (pv.voters.containsKey(voter)) Helper.abort("vote" + ": " + "Already voted on this proposal");
 
         pv.voters.put(voter, vote);
         if (vote < 0) {
@@ -438,20 +462,23 @@ public static void vote(int id, int vote, Hash160 voter) {
     public static Object[] execute(int id) {
         abortIfPaused();
         ByteString proposalBytes = proposals.get(id);
-        if (proposalBytes == null) Helper.abort("execute" + ": " +  "Proposal doesn't exist");
+        if (proposalBytes == null) Helper.abort("execute" + ": " + "Proposal doesn't exist");
         Proposal proposal = (Proposal) new StdLib().deserialize(proposalBytes);
-        if (proposal.endorser == null || getTime() < proposal.timeLockEnd)
-            Helper.abort("execute" + ": " +  "Proposal not in execution phase");
-        if (proposal.executed) Helper.abort("execute" + ": " +  "Proposal already executed");
-        if (proposal.expiration <= getTime()) Helper.abort("execute" + ": " +  "Proposal expired");
+        if (proposal.endorser == null || getTime() < proposal.timeLockEnd) {
+            Helper.abort("execute" + ": " + "Proposal not in execution phase");
+        }
+        if (proposal.executed) Helper.abort("execute" + ": " + "Proposal already executed");
+        if (proposal.expiration <= getTime()) Helper.abort("execute" + ": " + "Proposal expired");
         ProposalData data = (ProposalData) new StdLib().deserialize(proposalData.get(id));
         ProposalVotes votes = (ProposalVotes) new StdLib().deserialize(proposalVotes.get(id));
         int voteCount = votes.approve + votes.abstain + votes.reject;
-        if (voteCount * 100 / Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) < data.quorum)
-            Helper.abort("execute" + ": " +  "Quorum not reached");
+        if (voteCount * 100 / Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) < data.quorum) {
+            Helper.abort("execute" + ": " + "Quorum not reached");
+        }
         int yesNoCount = votes.approve + votes.reject;
-        if (yesNoCount == 0 || (votes.approve * 100 / yesNoCount <= data.acceptanceRate))
-            Helper.abort("execute" + ": " +  "Proposal rejected");
+        if (yesNoCount == 0 || (votes.approve * 100 / yesNoCount <= data.acceptanceRate)) {
+            Helper.abort("execute" + ": " + "Proposal rejected");
+        }
 
         proposal.executed = true;
         Object[] returnVals = new Object[data.intents.length];
@@ -489,17 +516,17 @@ private static void abortOnInvalidValue(String paramKey, int value) {
             case VOTING_LENGTH_KEY:
             case TIMELOCK_LENGTH_KEY:
             case EXPIRATION_LENGTH_KEY:
-                if (value < 0) Helper.abort("changeParam" + ": " +  "Invalid parameter value");
+                if (value < 0) Helper.abort("changeParam" + ": " + "Invalid parameter value");
                 break;
             case MIN_ACCEPTANCE_RATE_KEY:
             case MIN_QUORUM_KEY:
-                if (value < 0 || value > 100) Helper.abort("changeParam" + ": " +  "Invalid parameter value");
+                if (value < 0 || value > 100) Helper.abort("changeParam" + ": " + "Invalid parameter value");
                 break;
             case MULTI_SIG_THRESHOLD_KEY:
-                if (value <= 0 || value > 100) Helper.abort("changeParam" + ": " +  "Invalid parameter value");
+                if (value <= 0 || value > 100) Helper.abort("changeParam" + ": " + "Invalid parameter value");
                 break;
             default:
-                Helper.abort("changeParam" + ": " +  "Unknown parameter");
+                Helper.abort("changeParam" + ": " + "Unknown parameter");
         }
     }
 
@@ -514,7 +541,7 @@ public static void addMember(ECPoint memberPubKey) {
         abortIfPaused();
         abortIfCallerIsNotSelf();
         Hash160 memberHash = createStandardAccount(memberPubKey);
-        if (members.get(memberHash.toByteString()) != null) Helper.abort("addMember" + ": " +  "Already a member");
+        if (members.get(memberHash.toByteString()) != null) Helper.abort("addMember" + ": " + "Already a member");
         members.put(memberHash.toByteString(), memberPubKey.toByteString());
         Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) + 1);
         memberAdded.fire(memberHash);
@@ -531,7 +558,7 @@ public static void removeMember(ECPoint memberPubKey) {
         abortIfPaused();
         abortIfCallerIsNotSelf();
         Hash160 memberHash = createStandardAccount(memberPubKey);
-        if (members.get(memberHash.toByteString()) == null) Helper.abort("removeMember" + ": " +  "Not a member");
+        if (members.get(memberHash.toByteString()) == null) Helper.abort("removeMember" + ": " + "Not a member");
         members.delete(memberHash.toByteString());
         Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) - 1);
         memberRemoved.fire(memberHash);
@@ -560,9 +587,9 @@ public static void pause() {
         try {
             membersMultiSigHash = calcMembersMultiSigAccount();
         } catch (Exception e) {
-            Helper.abort("pause" + ": " +  e.getMessage());
+            Helper.abort("pause" + ": " + e.getMessage());
         }
-        if (!checkWitness(membersMultiSigHash)) Helper.abort("pause" + ": " +  "Not authorized");
+        if (!checkWitness(membersMultiSigHash)) Helper.abort("pause" + ": " + "Not authorized");
         Storage.put(ctx, PAUSED_KEY, 1);
         paused.fire();
     }
@@ -572,22 +599,22 @@ public static void unpause() {
         try {
             membersMultiSigHash = calcMembersMultiSigAccount();
         } catch (Exception e) {
-            Helper.abort("pause" + ": " +  e.getMessage());
+            Helper.abort("pause" + ": " + e.getMessage());
         }
-        if (!checkWitness(membersMultiSigHash)) Helper.abort("unpause" + ": " +  "Not authorized");
+        if (!checkWitness(membersMultiSigHash)) Helper.abort("unpause" + ": " + "Not authorized");
         Storage.put(ctx, PAUSED_KEY, 0);
         unpaused.fire();
     }
 
     private static void abortIfCallerIsNotSelf() {
         if (Runtime.getCallingScriptHash() != Runtime.getExecutingScriptHash()) {
-            Helper.abort("abortIfCallerIsNotSelf" + ": " +  "Method only callable by the contract itself");
+            Helper.abort("abortIfCallerIsNotSelf" + ": " + "Method only callable by the contract itself");
         }
     }
 
     public static void abortIfPaused() {
         if (Storage.getBoolean(getReadOnlyContext(), PAUSED_KEY)) {
-            Helper.abort("abortIfPaused" + ": " +  "Contract is paused");
+            Helper.abort("abortIfPaused" + ": " + "Contract is paused");
         }
     }
 }
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
index 661ac91..3eab3de 100644
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
+++ b/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
@@ -48,7 +48,9 @@
 @ManifestExtra(key = "Email", value = "info@grantshares.io")
 @ManifestExtra(key = "Description", value = "The treasury of the GrantShares DAO")
 @ManifestExtra(key = "Website", value = "https://grantshares.io")
+//@formatter:off
 @ContractSourceCode("https://github.com/AxLabs/grantshares-contracts/blob/main/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java")
+//@formatter:on
 @DisplayName("GrantSharesTreasury")
 public class GrantSharesTreasury {
 
@@ -215,7 +217,8 @@ private static List<ECPoint> getFunderPublicKeys() {
     public static Hash160 calcFundersMultiSigAddress() throws Exception {
         List<ECPoint> funderPublicKeys = getFunderPublicKeys();
         return Account.createMultiSigAccount(calcFundersMultiSigAddressThreshold(funderPublicKeys.size()),
-                funderPublicKeys.toArray());
+                funderPublicKeys.toArray()
+        );
     }
 
     /**
@@ -246,8 +249,9 @@ private static int calcFundersMultiSigAddressThreshold(int count) throws Excepti
         if (thresholdTimes100 % 100 != 0) {
             threshold += 1; // Always round up.
         }
-        if (threshold == 0)
+        if (threshold == 0) {
             throw new Exception("[GrantSharesTreasury.calcFundersMultiSigAddressThreshold] Threshold was zero");
+        }
         return threshold;
     }
 
@@ -275,7 +279,8 @@ public static Map<Hash160, Integer> getWhitelistedTokens() {
     @Safe
     public static boolean isPaused() {
         return (boolean) Contract.call(new Hash160(Storage.get(getReadOnlyContext(), OWNER_KEY)),
-                "isPaused", CallFlags.ReadOnly, new Object[]{});
+                "isPaused", CallFlags.ReadOnly, new Object[]{}
+        );
     }
 
     /**
@@ -299,8 +304,9 @@ public static int getFundersMultiSigThresholdRatio() {
     public static void setFundersMultiSigThresholdRatio(Integer value) {
         abortIfPaused();
         abortIfCallerIsNotOwner();
-        if (value <= 0 || value > 100)
+        if (value <= 0 || value > 100) {
             Helper.abort("setFundersMultiSigThresholdRatio" + ": " + "Invalid threshold ratio");
+        }
         Storage.put(ctx, MULTI_SIG_THRESHOLD_KEY, value);
         thresholdChanged.fire(value);
     }
@@ -372,8 +378,9 @@ public static void addWhitelistedToken(Hash160 token, int maxFundingAmount) {
     public static void removeWhitelistedToken(Hash160 token) {
         abortIfPaused();
         abortIfCallerIsNotOwner();
-        if (whitelistedTokens.get(token.toByteString()) == null)
+        if (whitelistedTokens.get(token.toByteString()) == null) {
             Helper.abort("removeWhitelistedToken" + ": " + "Not a whitelisted token");
+        }
         whitelistedTokens.delete(token.toByteString());
         whitelistedTokenRemoved.fire(token);
     }
@@ -441,8 +448,9 @@ public static void drain() {
     public static void voteCommitteeMemberWithLeastVotes() {
         abortIfPaused();
         ECPoint c = getCommitteeMemberWithLeastVotes();
-        if (!new NeoToken().vote(Runtime.getExecutingScriptHash(), c))
+        if (!new NeoToken().vote(Runtime.getExecutingScriptHash(), c)) {
             Helper.abort("voteCommitteeMemberWithLeastVotes" + ": " + "Failed voting on candidate");
+        }
         voted.fire(c);
     }
 
@@ -480,8 +488,9 @@ public static void updateContract(ByteString nef, String manifest, Object data)
     }
 
     private static void abortIfCallerIsNotOwner() {
-        if (Runtime.getCallingScriptHash().toByteString() != Storage.get(getReadOnlyContext(), OWNER_KEY))
+        if (Runtime.getCallingScriptHash().toByteString() != Storage.get(getReadOnlyContext(), OWNER_KEY)) {
             Helper.abort("abortIfCallerIsNotOwner" + ": " + "Not authorised");
+        }
     }
 
     private static void abortIfPaused() {
diff --git a/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java b/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
index b1fda0d..fddcc35 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
@@ -56,7 +56,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
-              batchFile = "setup.batch")
+        batchFile = "setup.batch")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class GovernanceMembersTest {
 
@@ -92,7 +92,8 @@ public static void setUp() throws Throwable {
     @Test
     public void fail_calling_add_member_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.invokeFunction(ADD_MEMBER, hash160(bob)).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.invokeFunction(ADD_MEMBER, hash160(bob)).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
     }
 
@@ -106,7 +107,8 @@ public void execute_add_member() throws Throwable {
                 gov.getScriptHash(),
                 ADD_MEMBER,
                 array(publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String offchainUri = "execute_add_member";
 
         // 1. Create and endorse proposal
@@ -130,7 +132,8 @@ public void execute_add_member() throws Throwable {
         assertThat(returnVals.get(0).getValue(), is(nullValue()));
         assertThat(execution.getNotifications().get(0).getEventName(), is(MEMBER_ADDED));
         assertThat(execution.getNotifications().get(0).getState().getList().get(0).getAddress(),
-                is(bob.getAddress()));
+                is(bob.getAddress())
+        );
         assertThat(execution.getNotifications().get(1).getEventName(), is(PROPOSAL_EXECUTED));
 
         List<ECKeyPair.ECPublicKey> newMembers = gov.getMembers();
@@ -139,7 +142,8 @@ public void execute_add_member() throws Throwable {
                 bob.getECKeyPair().getPublicKey(),
                 charlie.getECKeyPair().getPublicKey(),
                 alice.getECKeyPair().getPublicKey(),
-                denise.getECKeyPair().getPublicKey()));
+                denise.getECKeyPair().getPublicKey()
+        ));
 
         assertThat(gov.getMembersCount(), is(4));
     }
@@ -150,7 +154,8 @@ public void fail_execute_add_member_with_already_member() throws Throwable {
                 gov.getScriptHash(),
                 ADD_MEMBER,
                 array(publicKey(alice.getECKeyPair().getPublicKey().getEncoded(true))),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_execute_add_member_with_already_member";
 
         // 1. Create and endorse proposal
@@ -162,7 +167,8 @@ public void fail_execute_add_member_with_already_member() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Already a member"));
     }
 
@@ -174,7 +180,8 @@ public void fail_execute_add_member_with_invalid_public_key() throws Throwable {
                 gov.getScriptHash(),
                 ADD_MEMBER,
                 array(publicKey(invalidPubKey)),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_execute_add_member_with_invalid_public_key";
 
         // 1. Create and endorse proposal
@@ -196,7 +203,8 @@ public void fail_execute_add_member_with_invalid_public_key() throws Throwable {
     public void fail_calling_remove_member_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.invokeFunction(REMOVE_MEMBER, hash160(bob)).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
     }
 
@@ -209,7 +217,8 @@ public void execute_remove_member() throws Throwable {
                 gov.getScriptHash(),
                 REMOVE_MEMBER,
                 array(publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String offchainUri = "execute_remove_member";
 
         // 1. Create and endorse proposal
@@ -233,7 +242,8 @@ public void execute_remove_member() throws Throwable {
         assertThat(returnVals.get(0).getValue(), is(nullValue()));
         assertThat(execution.getNotifications().get(0).getEventName(), is(MEMBER_REMOVED));
         assertThat(execution.getNotifications().get(0).getState().getList().get(0).getAddress(),
-                is(bob.getAddress()));
+                is(bob.getAddress())
+        );
         assertThat(execution.getNotifications().get(1).getEventName(), is(PROPOSAL_EXECUTED));
 
         List<ECKeyPair.ECPublicKey> newMembers = gov.getMembers();
@@ -241,7 +251,8 @@ public void execute_remove_member() throws Throwable {
         assertThat(newMembers, containsInAnyOrder(
                 charlie.getECKeyPair().getPublicKey(),
                 alice.getECKeyPair().getPublicKey(),
-                denise.getECKeyPair().getPublicKey()));
+                denise.getECKeyPair().getPublicKey()
+        ));
     }
 
     @Test
@@ -251,7 +262,8 @@ public void fail_execute_remove_member_with_non_member() throws Throwable {
                 gov.getScriptHash(),
                 REMOVE_MEMBER,
                 array(publicKey(acc.getECKeyPair().getPublicKey().getEncoded(true))),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_execute_remove_member_with_non_member";
 
         // 1. Create and endorse proposal
@@ -263,7 +275,8 @@ public void fail_execute_remove_member_with_non_member() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not a member"));
     }
 
@@ -277,7 +290,8 @@ public void get_members() throws IOException {
         assertThat(members, contains(
                 alice.getECKeyPair().getPublicKey().getEncoded(true),
                 charlie.getECKeyPair().getPublicKey().getEncoded(true),
-                denise.getECKeyPair().getPublicKey().getEncoded(true)));
+                denise.getECKeyPair().getPublicKey().getEncoded(true)
+        ));
     }
 
     @Test
diff --git a/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java b/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
index 098ea61..bccb32f 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
@@ -54,7 +54,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
-              batchFile = "setup.batch")
+        batchFile = "setup.batch")
 public class GovernanceParametersTest {
 
     @RegisterExtension
@@ -141,7 +141,8 @@ public void execute_change_parameter() throws Throwable {
     public void fail_calling_change_parameter_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.invokeFunction(CHANGE_PARAM, string(REVIEW_LENGTH_KEY), integer(100)).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
     }
 
@@ -161,7 +162,8 @@ public void fail_changing_unknown_parameter() throws Throwable {
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Unknown parameter"));
     }
 
@@ -179,7 +181,8 @@ public void fail_changing_voting_length_to_negative_value() throws Throwable {
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid parameter value"));
         assertThat(gov.getParameter(VOTING_LENGTH_KEY).getInteger().intValue(), is(PHASE_LENGTH * 1000));
     }
@@ -198,7 +201,8 @@ public void fail_changing_min_acceptance_rate_to_negative_value() throws Throwab
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid parameter value"));
         assertThat(gov.getParameter(MIN_ACCEPTANCE_RATE_KEY).getInteger().intValue(), is(MIN_ACCEPTANCE_RATE));
     }
@@ -217,7 +221,8 @@ public void fail_changing_min_acceptance_rate_to_more_than_hundred() throws Thro
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid parameter value"));
         assertThat(gov.getParameter(MIN_ACCEPTANCE_RATE_KEY).getInteger().intValue(), is(MIN_ACCEPTANCE_RATE));
     }
@@ -236,7 +241,8 @@ public void fail_changing_multisig_threshold_to_zero() throws Throwable {
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid parameter value"));
         assertThat(gov.getParameter(MULTI_SIG_THRESHOLD_KEY).getInteger().intValue(), is(MULTI_SIG_THRESHOLD_RATIO));
     }
@@ -255,7 +261,8 @@ public void fail_changing_multisig_threshold_to_more_than_hundred() throws Throw
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid parameter value"));
         assertThat(gov.getParameter(MULTI_SIG_THRESHOLD_KEY).getInteger().intValue(), is(MULTI_SIG_THRESHOLD_RATIO));
     }
diff --git a/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
index ba8b1d7..cdaba78 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
@@ -80,7 +80,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
-              batchFile = "setup.batch")
+        batchFile = "setup.batch")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class GrantSharesGovTest {
 
@@ -112,7 +112,9 @@ public static void setUp() throws Throwable {
 
         Hash256 creationTx = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()),
                 array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                        integer(CallFlags.ALL.getValue()))), string("default_proposal"), integer(-1)).signers(
+                        integer(CallFlags.ALL.getValue())
+                )), string("default_proposal"), integer(-1)
+        ).signers(
                 AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
         defaultProposalId = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(
@@ -129,10 +131,12 @@ public void succeed_creating_and_retrieving_proposal() throws Throwable {
         Hash160 targetParam2 = alice.getScriptHash();
         int targetParam3 = 1;
         ContractParameter intent = array(targetContract, targetMethod, array(targetParam1, targetParam2, targetParam3),
-                integer(CallFlags.ALL.getValue()));
+                integer(CallFlags.ALL.getValue())
+        );
         String offchainUri = "offchainUri of the proposal";
         Hash256 proposalCreationTx = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()), array(intent),
-                        string(offchainUri), integer(-1)) // no linked proposal
+                        string(offchainUri), integer(-1)
+                ) // no linked proposal
                 .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(proposalCreationTx, neow3j);
 
@@ -174,12 +178,14 @@ public void succeed_creating_and_retrieving_proposal() throws Throwable {
     @Order(0)
     public void fail_creating_with_missing_linked_proposal() {
         ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
-                array(gov.getScriptHash(), alice.getScriptHash(), 1));
+                array(gov.getScriptHash(), alice.getScriptHash(), 1)
+        );
         String offchainUri = "fail_creating_with_missing_linked_proposal";
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), offchainUri, 1000, intent).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Linked proposal doesn't exist"));
     }
 
@@ -187,17 +193,22 @@ public void fail_creating_with_missing_linked_proposal() {
     @Order(0)
     public void fail_creating_with_bad_quorum() {
         ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
-                array(gov.getScriptHash(), alice.getScriptHash(), 1));
+                array(gov.getScriptHash(), alice.getScriptHash(), 1)
+        );
         String offchainUri = "fail_creating_with_bad_quorum";
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, MIN_QUORUM - 1,
-                        intent).signers(AccountSigner.calledByEntry(alice)).sign());
+                        intent
+                ).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid quorum"));
 
         e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, 101,
-                        intent).signers(AccountSigner.calledByEntry(alice)).sign());
+                        intent
+                ).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid quorum"));
     }
 
@@ -205,17 +216,21 @@ public void fail_creating_with_bad_quorum() {
     @Order(0)
     public void fail_creating_with_bad_acceptance_rate() {
         ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
-                array(gov.getScriptHash(), alice.getScriptHash(), 1));
+                array(gov.getScriptHash(), alice.getScriptHash(), 1)
+        );
         String offchainUri = "fail_creating_with_bad_acceptance_rate";
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE - 1, MIN_QUORUM,
-                        intent).signers(AccountSigner.calledByEntry(alice)).sign());
+                        intent
+                ).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid acceptance rate"));
 
         e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, 101, MIN_QUORUM, intent).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid acceptance rate"));
     }
 
@@ -272,7 +287,8 @@ public void succeed_endorsing_with_member() throws Throwable {
     public void fail_endorsing_with_non_member() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(defaultProposalId, bob.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -281,7 +297,8 @@ public void fail_endorsing_with_non_member() {
     public void fail_endorsing_with_member_but_wrong_signer() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(defaultProposalId, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -302,7 +319,8 @@ public void fail_endorsing_already_endorsed_proposal() throws Throwable {
         // 3. Endorse again
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(id, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal already endorsed"));
     }
 
@@ -311,7 +329,8 @@ public void fail_endorsing_already_endorsed_proposal() throws Throwable {
     public void fail_endorsing_non_existent_proposal() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(1000, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
     }
 
@@ -326,7 +345,8 @@ public void fail_endorsing_expired_proposal() throws Throwable {
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(id, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal expired"));
     }
 
@@ -385,7 +405,8 @@ public void fail_voting_in_review_and_queued_phase() throws Throwable {
 
         // 3. Vote in review phase
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal not active"));
 
         // 5. Fast-forward till after the voting phase.
@@ -393,7 +414,8 @@ public void fail_voting_in_review_and_queued_phase() throws Throwable {
 
         // 4. Vote in queued or later phase
         e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal not active"));
     }
 
@@ -420,7 +442,8 @@ public void fail_voting_multiple_times() throws Throwable {
 
         // 5. Vote the second time
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.vote(id, 1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.vote(id, 1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Already voted on this proposal"));
 
         // 6. Check votes
@@ -438,7 +461,8 @@ public void fail_voting_with_non_member() {
         // Vote on the default proposal. Doesn't matter in what phase it is.
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.vote(defaultProposalId, -1, bob.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -446,7 +470,8 @@ public void fail_voting_with_non_member() {
     @Order(0)
     public void fail_voting_on_non_existent_proposal() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.vote(1000, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign());
+                () -> gov.vote(1000, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
     }
 
@@ -456,7 +481,8 @@ public void fail_voting_on_not_endorsed_proposal() {
         // Vote on the default proposal. Doesn't matter in what phase it is.
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.vote(defaultProposalId, -1, charlie.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(charlie)).sign());
+                        AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal not active"));
     }
 
@@ -466,7 +492,8 @@ public void fail_voting_with_invalid_vote() {
         // Vote on the default proposal. Doesn't matter in what phase it is.
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.vote(defaultProposalId, 2, charlie.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(charlie)).sign());
+                        AccountSigner.calledByEntry(charlie)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid vote"));
     }
 
@@ -477,24 +504,32 @@ public void create_proposal_with_large_intents_and_offchainUri() throws Throwabl
                 "aabcababcababcababcabbcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcaabcabcabcabcabcabca";
         Hash256 tx = gov.invokeFunction(CREATE, hash160(bob),
                 array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()),
+                                CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()),
+                                CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()),
+                                CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()),
+                                CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()),
+                                CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue()), array(NeoToken.SCRIPT_HASH,
+                                CallFlags.ALL.getValue()
+                        ), array(NeoToken.SCRIPT_HASH,
                                 "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
                                         "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
                                 array(new Hash160(defaultAccountScriptHash()), new Hash160(defaultAccountScriptHash()),
                                         new Hash160(defaultAccountScriptHash()),
                                         new Hash160(defaultAccountScriptHash()),
                                         new Hash160(defaultAccountScriptHash()),
-                                        new Hash160(defaultAccountScriptHash())), CallFlags.ALL.getValue()),
+                                        new Hash160(defaultAccountScriptHash())
+                                ), CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH,
                                 "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
                                         "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
@@ -504,7 +539,9 @@ public void create_proposal_with_large_intents_and_offchainUri() throws Throwabl
                                         new Hash160(defaultAccountScriptHash()),
                                         new Hash160(defaultAccountScriptHash()),
                                         new Hash160(defaultAccountScriptHash()),
-                                        new Hash160(defaultAccountScriptHash())), CallFlags.ALL.getValue()),
+                                        new Hash160(defaultAccountScriptHash())
+                                ), CallFlags.ALL.getValue()
+                        ),
                         array(NeoToken.SCRIPT_HASH,
                                 "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
                                         "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
@@ -521,8 +558,12 @@ public void create_proposal_with_large_intents_and_offchainUri() throws Throwabl
                                                 "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
                                                 "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
                                                 "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
-                                                "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi"),
-                                CallFlags.ALL.getValue())), string(offchainUri), integer(-1)).signers(
+                                                "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi"
+                                ),
+                                CallFlags.ALL.getValue()
+                        )
+                ), string(offchainUri), integer(-1)
+        ).signers(
                 AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(tx, neow3j);
 
@@ -546,7 +587,9 @@ public void succeed_creating_exact_same_proposal_that_already_exists() throws IO
         // Recreate default proposal
         InvocationResult result = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()),
                 array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                        CallFlags.ALL.getValue())), string("default_proposal"), integer(-1)).signers(
+                        CallFlags.ALL.getValue()
+                )), string("default_proposal"), integer(-1)
+        ).signers(
                 AccountSigner.calledByEntry(alice)).callInvokeScript().getInvocationResult();
         assertThat(result.getStack().get(0).getInteger().intValue(), is(not(defaultProposalId)));
         assertThat(result.getStack().get(0).getInteger().intValue(), is(greaterThan(0)));
@@ -557,7 +600,8 @@ public void succeed_creating_exact_same_proposal_that_already_exists() throws IO
     public void get_proposals() throws Throwable {
         ContractParameter intents = array(
                 array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                        CallFlags.ALL.getValue()));
+                        CallFlags.ALL.getValue()
+                ));
         TestHelper.createAndEndorseProposal(gov, neow3j, bob, alice, intents, "some_proposal");
 
         ProposalPaginatedStruct page = gov.getProposals(0, 1);
@@ -571,11 +615,13 @@ public void get_proposals() throws Throwable {
         assertThat(proposal.id, is(greaterThanOrEqualTo(1)));
 
         String exception = gov.callInvokeFunction("getProposals",
-                asList(integer(-1), integer(1))).getInvocationResult().getException();
+                asList(integer(-1), integer(1))
+        ).getInvocationResult().getException();
         assertThat(exception, containsString("Page number was negative"));
 
         exception = gov.callInvokeFunction("getProposals",
-                asList(integer(0), integer(0))).getInvocationResult().getException();
+                asList(integer(0), integer(0))
+        ).getInvocationResult().getException();
         assertThat(exception, containsString("Page number was negative or zero"));
     }
 
@@ -592,7 +638,8 @@ public void get_number_of_proposals() throws IOException {
     @Order(0)
     public void fail_pausing_contract_without_members_account() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.invokeFunction(PAUSE).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.invokeFunction(PAUSE).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorized"));
     }
 
@@ -600,7 +647,8 @@ public void fail_pausing_contract_without_members_account() {
     @Order(0)
     public void fail_unpausing_contract_without_members_account() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.invokeFunction(UNPAUSE).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.invokeFunction(UNPAUSE).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorized"));
     }
 
@@ -612,7 +660,8 @@ public void succeed_pausing_contract() throws Throwable {
 
         Account membersAccount = createMultiSigAccount(1, alice, charlie);
         Transaction tx = gov.invokeFunction(PAUSE).signers(AccountSigner.none(bob),
-                AccountSigner.calledByEntry(membersAccount)).getUnsignedTransaction();
+                AccountSigner.calledByEntry(membersAccount)
+        ).getUnsignedTransaction();
         Hash256 txHash = tx.addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair())).addMultiSigWitness(
                 membersAccount.getVerificationScript(), alice).send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(txHash, neow3j);
@@ -632,7 +681,8 @@ public void fail_execute_update_contract_directly() throws Throwable {
         String manifestString = getObjectMapper().writeValueAsString(manifest);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.updateContract(nef.toArray(), manifestString, null).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
     }
 
@@ -644,7 +694,9 @@ public void fail_create_proposal_calling_contract_management() {
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.createProposal(alice.getScriptHash(), "fail_create_proposal_calling_contract_management", -1,
-                        intent1, intent2).signers(AccountSigner.calledByEntry(alice)).sign());
+                        intent1, intent2
+                ).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid intents"));
     }
 
@@ -653,7 +705,8 @@ public void fail_create_proposal_calling_contract_management() {
     public void fail_change_param_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.invokeFunction(CHANGE_PARAM, string(MIN_ACCEPTANCE_RATE_KEY), integer(50)).signers(
-                        AccountSigner.calledByEntry(alice)).sign());
+                        AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -662,8 +715,10 @@ public void fail_change_param_on_paused_contract() {
     public void fail_add_member_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.invokeFunction(ADD_MEMBER,
-                        publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))
+                ).signers(
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -672,8 +727,10 @@ public void fail_add_member_on_paused_contract() {
     public void fail_remove_member_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.invokeFunction(REMOVE_MEMBER,
-                        publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))
+                ).signers(
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -681,7 +738,8 @@ public void fail_remove_member_on_paused_contract() {
     @Test
     public void fail_execute_proposal_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(defaultProposalId).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(defaultProposalId).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -690,7 +748,8 @@ public void fail_execute_proposal_on_paused_contract() {
     public void fail_vote_on_proposal_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.vote(defaultProposalId, 1, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -699,7 +758,8 @@ public void fail_vote_on_proposal_on_paused_contract() {
     public void fail_endorse_proposal_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.endorseProposal(defaultProposalId, alice.getScriptHash()).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -708,7 +768,8 @@ public void fail_endorse_proposal_on_paused_contract() {
     public void fail_update_contract_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> gov.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null).signers(
-                        AccountSigner.calledByEntry(bob)).sign());
+                        AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -720,7 +781,8 @@ public void succeed_unpausing_contract() throws Throwable {
 
         Account membersAccount = createMultiSigAccount(1, alice, charlie);
         Transaction tx = gov.invokeFunction(UNPAUSE).signers(AccountSigner.none(bob),
-                AccountSigner.calledByEntry(membersAccount)).getUnsignedTransaction();
+                AccountSigner.calledByEntry(membersAccount)
+        ).getUnsignedTransaction();
         Hash256 txHash = tx.addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair())).addMultiSigWitness(
                 membersAccount.getVerificationScript(), alice).send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(txHash, neow3j);
@@ -743,7 +805,8 @@ public void execute_proposal_with_update_contract() throws Throwable {
 
         ContractParameter intents = array(
                 array(gov.getScriptHash(), UPDATE_CONTRACT, array(nef.toArray(), manifestBytes, data),
-                        CallFlags.ALL.getValue()));
+                        CallFlags.ALL.getValue()
+                ));
         String offchainUri = "execute_proposal_with_update_contract";
 
         // 1. Create and endorse proposal
diff --git a/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java b/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
index 2b2ed1f..acef2f1 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
@@ -79,7 +79,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = {GrantSharesGov.class, GrantSharesTreasury.class},
-              blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
+        blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class GrantSharesTreasuryTest {
 
@@ -209,7 +209,8 @@ public void succeed_voting_on_committee_member() throws Throwable {
     public void fail_calling_add_whitelisted_token_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
-                        .sign());
+                        .sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -218,7 +219,8 @@ public void fail_calling_add_whitelisted_token_directly() {
     public void fail_calling_remove_whitelisted_token_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
-                        .sign());
+                        .sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -227,7 +229,8 @@ public void fail_calling_remove_whitelisted_token_directly() {
     public void fail_calling_add_funder_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
-                        .signers(AccountSigner.calledByEntry(alice)).sign());
+                        .signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -236,7 +239,8 @@ public void fail_calling_add_funder_directly() {
     public void fail_calling_remove_funder_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.removeFunder(charlie.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
-                        .sign());
+                        .sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -266,7 +270,8 @@ public void fail_execute_update_contract_directly() throws Throwable {
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.invokeFunction(UPDATE_CONTRACT, byteArray(nef.toArray()), byteArray(manifestBytes), data)
-                        .signers(AccountSigner.calledByEntry(alice)).sign());
+                        .signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -275,7 +280,8 @@ public void fail_execute_update_contract_directly() throws Throwable {
     public void fail_release_tokens_with_non_whitelisted_token() throws Throwable {
         final Hash160 someToken = new Hash160("1a1512528147558851b39c2cd8aa47da7418aba1");
         ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), someToken,
-                alice.getScriptHash(), BigInteger.TEN);
+                alice.getScriptHash(), BigInteger.TEN
+        );
         String offchainUri = "fail_release_tokens_with_non_whitelisted_token";
 
         // 1. Create and endorse proposal
@@ -288,7 +294,8 @@ public void fail_release_tokens_with_non_whitelisted_token() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Token not whitelisted"));
     }
 
@@ -296,7 +303,8 @@ public void fail_release_tokens_with_non_whitelisted_token() throws Throwable {
     @Order(0)
     public void fail_release_tokens_with_to_high_amount() throws Throwable {
         ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), GasToken.SCRIPT_HASH,
-                alice.getScriptHash(), GAS_MAX_AMOUNT.add(BigInteger.ONE));
+                alice.getScriptHash(), GAS_MAX_AMOUNT.add(BigInteger.ONE)
+        );
         String offchainUri = "fail_release_tokens_with_to_high_amount";
 
         // 1. Create and endorse proposal
@@ -310,7 +318,8 @@ public void fail_release_tokens_with_to_high_amount() throws Throwable {
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
 
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Above token's max funding amount"));
     }
 
@@ -319,7 +328,8 @@ public void fail_release_tokens_with_to_high_amount() throws Throwable {
     public void fail_calling_release_tokens_directly() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
-                        .signers(AccountSigner.calledByEntry(bob)).sign());
+                        .signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorised"));
     }
 
@@ -328,7 +338,8 @@ public void fail_calling_release_tokens_directly() {
     public void fail_adding_invalid_funder() throws Throwable {
         ContractParameter intent = new IntentParam(treasury.getScriptHash(), "addFunder",
                 byteArray("3ff68d232a60f23a5805b8c40f7e61747f"),
-                array(Collections.singletonList(alice.getECKeyPair().getPublicKey())));
+                array(Collections.singletonList(alice.getECKeyPair().getPublicKey()))
+        );
         String offchainUri = "fail_adding_invalid_funder";
 
         // 1. Create and endorse proposal
@@ -341,7 +352,8 @@ public void fail_adding_invalid_funder() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid funder hash"));
     }
 
@@ -361,7 +373,8 @@ public void fail_adding_funder_with_no_public_keys() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("List of public keys is empty"));
     }
 
@@ -370,7 +383,9 @@ public void fail_adding_funder_with_no_public_keys() throws Throwable {
     public void fail_adding_funder_with_invalid_public_key() throws Throwable {
         IntentParam intent = new IntentParam(treasury.getScriptHash(), "addFunder", hash160(alice.getScriptHash()),
                 array(publicKey(alice.getECKeyPair().getPublicKey()),
-                        byteArray("03dab84c1243ec01ab2500e1a8c7a1546a26d734628180b0cf64e72bf776")));
+                        byteArray("03dab84c1243ec01ab2500e1a8c7a1546a26d734628180b0cf64e72bf776")
+                )
+        );
         String offchainUri = "fail_adding_funder_with_invalid_public_key";
 
         // 1. Create and endorse proposal
@@ -383,7 +398,8 @@ public void fail_adding_funder_with_invalid_public_key() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid public key"));
     }
 
@@ -407,10 +423,12 @@ public void fail_setting_funders_multisig_threshold_ratio_with_invalid_value() t
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id1).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id1).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid threshold ratio"));
         e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id2).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id2).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid threshold ratio"));
     }
 
@@ -418,7 +436,8 @@ public void fail_setting_funders_multisig_threshold_ratio_with_invalid_value() t
     @Order(0)
     public void fail_adding_whitelisted_token_with_invalid_token() throws Throwable {
         ContractParameter intent = new IntentParam(treasury.getScriptHash(), "addWhitelistedToken",
-                byteArray("3ff68d232a60f23a5805b8c40f7e61747f"), integer(100));
+                byteArray("3ff68d232a60f23a5805b8c40f7e61747f"), integer(100)
+        );
         String offchainUri = "fail_adding_whitelisted_token_with_invalid_token";
 
         // 1. Create and endorse proposal
@@ -431,7 +450,8 @@ public void fail_adding_whitelisted_token_with_invalid_token() throws Throwable
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid token hash"));
     }
 
@@ -439,7 +459,8 @@ public void fail_adding_whitelisted_token_with_invalid_token() throws Throwable
     @Order(0)
     public void fail_adding_whitelisted_token_with_invalid_max_funding_amount() throws Throwable {
         ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
-                NeoToken.SCRIPT_HASH, BigInteger.ONE.negate());
+                NeoToken.SCRIPT_HASH, BigInteger.ONE.negate()
+        );
         String offchainUri = "fail_adding_whitelisted_token_with_invalid_max_funding_amount";
 
         // 1. Create and endorse proposal
@@ -452,7 +473,8 @@ public void fail_adding_whitelisted_token_with_invalid_max_funding_amount() thro
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Invalid max funding amount"));
     }
 
@@ -460,7 +482,8 @@ public void fail_adding_whitelisted_token_with_invalid_max_funding_amount() thro
     @Order(1)
     public void execute_proposal_with_add_single_sig_funder() throws Throwable {
         IntentParam intent = IntentParam.addFunderProposal(treasury.getScriptHash(), alice.getScriptHash(),
-                alice.getECKeyPair().getPublicKey());
+                alice.getECKeyPair().getPublicKey()
+        );
         String offchainUri = "execute_proposal_with_add_single_sig_funder";
 
         // 1. Create and endorse proposal
@@ -494,7 +517,8 @@ public void execute_proposal_with_add_multi_sig_funder() throws Throwable {
         Account multiSigFunder = Account.createMultiSigAccount(
                 asList(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()), 1);
         IntentParam intent = IntentParam.addFunderProposal(treasury.getScriptHash(), multiSigFunder.getScriptHash(),
-                denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey());
+                denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()
+        );
         String offchainUri = "execute_proposal_with_add_multi_sig_funder";
 
         // 1. Create and endorse proposal
@@ -526,7 +550,8 @@ public void execute_proposal_with_add_multi_sig_funder() throws Throwable {
     @Order(3)
     public void fail_adding_already_added_funder() throws Throwable {
         ContractParameter intent = IntentParam.addFunderProposal(treasury.getScriptHash(), alice.getScriptHash(),
-                alice.getECKeyPair().getPublicKey());
+                alice.getECKeyPair().getPublicKey()
+        );
         String offchainUri = "fail_adding_already_added_funder";
 
         // 1. Create and endorse proposal
@@ -539,7 +564,8 @@ public void fail_adding_already_added_funder() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Already a funder"));
     }
 
@@ -588,7 +614,8 @@ public void fail_removing_nonexistant_funder() throws Throwable {
         // 3. Skip till after vote and queued phase, then execute.
         ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not a funder"));
     }
 
@@ -634,7 +661,8 @@ public void fail_funding_treasury_with_non_whitelisted_token() throws Throwable
     @Order(12)
     public void execute_proposal_with_add_whitelisted_token() throws Throwable {
         ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
-                NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT_CHANGED);
+                NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT_CHANGED
+        );
         String offchainUri = "execute_proposal_with_add_whitelisted_token";
 
         // 1. Create and endorse proposal
@@ -668,7 +696,8 @@ public void execute_proposal_with_change_whitelisted_token_max_amount() throws T
         assertThat(tokens.get(NeoToken.SCRIPT_HASH), is(NEO_MAX_AMOUNT_CHANGED));
 
         ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
-                NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT);
+                NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT
+        );
         String offchainUri = "execute_proposal_with_change_whitelisted_token_max_amount";
 
         // 1. Create and endorse proposal
@@ -713,7 +742,8 @@ public void funding_treasury_with_whitelisted_token_and_funder() throws Throwabl
         assertThat(n.getContract(), is(GasToken.SCRIPT_HASH));
         assertThat(n.getState().getList().get(0).getAddress(), is(bob.getAddress()));
         assertThat(n.getState().getList().get(1).getAddress(),
-                is(treasury.getScriptHash().toAddress()));
+                is(treasury.getScriptHash().toAddress())
+        );
         assertThat(n.getState().getList().get(2).getInteger(), is(BigInteger.ONE));
 
         assertThat(gas.getBalanceOf(treasury.getScriptHash()).intValue(), is(initialValue + 1));
@@ -725,7 +755,8 @@ public void execute_proposal_with_release_tokens() throws Throwable {
         Account acc = Account.create();
         final BigInteger fundingAmount = BigInteger.TEN;
         ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), GasToken.SCRIPT_HASH,
-                acc.getScriptHash(), fundingAmount);
+                acc.getScriptHash(), fundingAmount
+        );
         String offchainUri = "execute_proposal_with_release_tokens";
 
         // 1. Create and endorse proposal
@@ -775,7 +806,8 @@ public void succeed_pausing_contract() throws Throwable {
     public void fail_add_funder_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
-                        .signers(AccountSigner.calledByEntry(alice)).sign());
+                        .signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -783,7 +815,8 @@ public void fail_add_funder_on_paused_contract() {
     @Test
     public void fail_remove_funder_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> treasury.removeFunder(alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> treasury.removeFunder(alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -792,7 +825,8 @@ public void fail_remove_funder_on_paused_contract() {
     public void fail_add_whitelisted_token_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
-                        .sign());
+                        .sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -801,7 +835,8 @@ public void fail_add_whitelisted_token_on_paused_contract() {
     public void fail_remove_whitelisted_token_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
-                        .sign());
+                        .sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -810,7 +845,8 @@ public void fail_remove_whitelisted_token_on_paused_contract() {
     public void fail_release_tokens_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
-                        .signers(AccountSigner.calledByEntry(alice)).sign());
+                        .signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -818,7 +854,8 @@ public void fail_release_tokens_on_paused_contract() {
     @Test
     public void fail_vote_on_committee_member_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> treasury.voteCommitteeMemberWithLeastVotes().signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> treasury.voteCommitteeMemberWithLeastVotes().signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -827,7 +864,8 @@ public void fail_vote_on_committee_member_on_paused_contract() {
     public void fail_update_contract_on_paused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
                 () -> treasury.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null)
-                        .signers(AccountSigner.calledByEntry(alice)).sign());
+                        .signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is paused"));
     }
 
@@ -876,7 +914,8 @@ public void execute_proposal_with_update_contract() throws Throwable {
         ContractParameter data = string("update contract");
 
         ContractParameter intents = array(array(treasury.getScriptHash(), UPDATE_CONTRACT,
-                array(nef.toArray(), manifestBytes, data), CallFlags.ALL.getValue()));
+                array(nef.toArray(), manifestBytes, data), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "execute_proposal_with_update_contract";
 
         // 1. Create and endorse proposal
diff --git a/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java b/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
index e157711..c57e213 100644
--- a/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
@@ -50,7 +50,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
-              batchFile = "setup.batch")
+        batchFile = "setup.batch")
 public class ProposalExecutionsTest {
 
     @RegisterExtension
@@ -70,7 +70,8 @@ public static DeployConfiguration deployConfig() throws Exception {
         DeployConfiguration config = new DeployConfiguration();
         config.setDeployParam(prepareDeployParameter(
                 ext.getAccount(ALICE), ext.getAccount(CHARLIE), ext.getAccount(DENISE), ext.getAccount(EVE),
-                ext.getAccount(FLORIAN)));
+                ext.getAccount(FLORIAN)
+        ));
         return config;
     }
 
@@ -89,19 +90,22 @@ public static void setUp() throws Throwable {
     @Test
     public void fail_executing_non_existent_proposal() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(1000).signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> gov.execute(1000).signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
     }
 
     @Test
     public void fail_executing_proposal_that_wasnt_endorsed() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 51), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 51), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_that_wasnt_endorsed";
 
         // 1. Create proposal then skip till after the queued phase without endorsing.
         Hash256 tx = gov.invokeFunction(CREATE, hash160(bob), intents, string(offchainUri),
-                        integer(-1))
+                        integer(-1)
+                )
                 .signers(AccountSigner.calledByEntry(bob))
                 .sign().send().getSendRawTransaction().getHash();
         Await.waitUntilTransactionIsExecuted(tx, neow3j);
@@ -111,7 +115,8 @@ public void fail_executing_proposal_that_wasnt_endorsed() throws Throwable {
 
         // 2. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal not in execution phase"));
     }
 
@@ -119,7 +124,8 @@ public void fail_executing_proposal_that_wasnt_endorsed() throws Throwable {
     public void fail_executing_proposal_without_votes() throws Throwable {
         int newValue = 60;
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, newValue), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, newValue), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_without_votes";
 
         // 1. Create and endorse proposal, then skip till after the queued phase without voting.
@@ -128,14 +134,16 @@ public void fail_executing_proposal_without_votes() throws Throwable {
 
         // 2. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Quorum not reached"));
     }
 
     @Test
     public void fail_executing_accepted_proposal_multiple_times() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_accepted_proposal_multiple_times";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -158,7 +166,8 @@ public void fail_executing_accepted_proposal_multiple_times() throws Throwable {
 
         // 4. Call execute the second time and fail.
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal already executed"));
     }
 
@@ -166,9 +175,12 @@ public void fail_executing_accepted_proposal_multiple_times() throws Throwable {
     public void execute_proposal_with_multiple_intents() throws Throwable {
         ContractParameter intents = array(
                 array(GasToken.SCRIPT_HASH, "transfer", array(alice.getScriptHash(),
-                        bob.getScriptHash(), 1, any(null)), CallFlags.ALL.getValue()),
+                        bob.getScriptHash(), 1, any(null)
+                ), CallFlags.ALL.getValue()),
                 array(GasToken.SCRIPT_HASH, "transfer", array(alice.getScriptHash(),
-                        bob.getScriptHash(), 1, any(null)), CallFlags.ALL.getValue()));
+                        bob.getScriptHash(), 1, any(null)
+                ), CallFlags.ALL.getValue())
+        );
         String offchainUri = "execute_proposal_with_multiple_intents";
 
         // 1. Create and endorse proposal
@@ -213,7 +225,8 @@ public void execute_proposal_with_multiple_intents() throws Throwable {
     @Test
     public void fail_executing_proposal_quorum_reached_but_rejected() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_quorum_reached_but_rejected";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -230,14 +243,16 @@ public void fail_executing_proposal_quorum_reached_but_rejected() throws Throwab
 
         // 3. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal rejected"));
     }
 
     @Test
     public void fail_executing_proposal_quorum_reached_but_all_abstained() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_quorum_reached_but_all_abstained";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -254,14 +269,16 @@ public void fail_executing_proposal_quorum_reached_but_all_abstained() throws Th
 
         // 3. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal rejected"));
     }
 
     @Test
     public void fail_executing_proposal_quorum_not_reached() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_quorum_not_reached";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -275,14 +292,16 @@ public void fail_executing_proposal_quorum_not_reached() throws Throwable {
 
         // 3. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Quorum not reached"));
     }
 
     @Test
     public void fail_executing_proposal_with_different_quorum_not_reached() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_with_different_quorum_not_reached";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -297,14 +316,16 @@ public void fail_executing_proposal_with_different_quorum_not_reached() throws T
 
         // 3. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Quorum not reached"));
     }
 
     @Test
     public void fail_executing_proposal_with_different_quorum_reached_different_rate_rejected() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "fail_executing_proposal_with_different_quorum_reached_different_rate_rejected";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -321,14 +342,16 @@ public void fail_executing_proposal_with_different_quorum_reached_different_rate
 
         // 3. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal rejected"));
     }
 
     @Test
     public void succeed_executing_proposal_with_different_quorum_reached_different_rate_accepted() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
-                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+                array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+        ));
         String offchainUri = "succeed_executing_proposal_with_different_quorum_reached_different_rate_accepted";
 
         // 1. Create and endorse proposal, then skip till voting phase.
@@ -352,7 +375,8 @@ public void succeed_executing_proposal_with_different_quorum_reached_different_r
     @Test
     public void fail_executing_expired_proposal() throws Throwable {
         ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM, array(REVIEW_LENGTH_KEY, 1),
-                CallFlags.ALL.getValue()));
+                CallFlags.ALL.getValue()
+        ));
         String discUrl = "fail_executing_expired_proposal";
 
         // 1. Create and endorse proposal, then skip till after the queued phase without voting.
@@ -366,7 +390,8 @@ public void fail_executing_expired_proposal() throws Throwable {
 
         // 2. Call execute
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Proposal expired"));
     }
 }
diff --git a/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java b/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
index 78b7034..31c0bcd 100644
--- a/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
@@ -58,7 +58,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @ContractTest(contracts = {GrantSharesGov.class, GrantSharesTreasury.class},
-              blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
+        blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TreasuryMultiSigTest {
     private static final int NEO_MAX_AMOUNT = 100;
@@ -100,9 +100,11 @@ public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws
                 asList(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()), 2);
         ContractParameter funders = array(
                 array(bob.getScriptHash(), // bob
-                        array(bob.getECKeyPair().getPublicKey())),
+                        array(bob.getECKeyPair().getPublicKey())
+                ),
                 array(multiSigFunder.getScriptHash(), // denise, eve
-                        array(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()))
+                        array(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey())
+                )
         );
 
         // whitelisted tokens
@@ -184,7 +186,8 @@ public void calc_funders_multisig_address() throws Throwable {
     @Order(0)
     public void fail_execute_drain_on_unpaused_contract() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> treasury.drain().signers(AccountSigner.calledByEntry(alice)).sign());
+                () -> treasury.drain().signers(AccountSigner.calledByEntry(alice)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Contract is not paused"));
     }
 
@@ -212,7 +215,8 @@ public void succeed_pausing_contract() throws Throwable {
     @Test
     public void fail_execute_drain_with_non_funder() {
         TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
-                () -> treasury.drain().signers(AccountSigner.calledByEntry(bob)).sign());
+                () -> treasury.drain().signers(AccountSigner.calledByEntry(bob)).sign()
+        );
         assertTrue(e.getMessage().endsWith("Not authorized"));
     }
 
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
index 24da51c..9967ae4 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
@@ -42,7 +42,8 @@ public Map<String, BigInteger> getParameters() throws IOException, UnexpectedRet
                 .getMap();
         return map.entrySet().stream().collect(Collectors.toMap(
                 i -> i.getKey().getString(),
-                i -> i.getValue().getInteger()));
+                i -> i.getValue().getInteger()
+        ));
     }
 
     public ProposalStruct getProposal(int id) throws IOException, UnexpectedReturnTypeException {
@@ -78,13 +79,15 @@ public boolean isPaused() throws IOException, UnexpectedReturnTypeException {
     public TransactionBuilder createProposal(Hash160 proposer, String offchainUri, int linkedProposal,
             ContractParameter... intents) {
         return invokeFunction(getMethodName(), hash160(proposer), array(asList(intents)),
-                string(offchainUri), integer(linkedProposal));
+                string(offchainUri), integer(linkedProposal)
+        );
     }
 
     public TransactionBuilder createProposal(Hash160 proposer, String offchainUri, int linkedProposal,
             int acceptanceRate, int quorum, ContractParameter... intents) {
         return invokeFunction(getMethodName(), hash160(proposer), array(asList(intents)),
-                string(offchainUri), integer(linkedProposal), integer(acceptanceRate), integer(quorum));
+                string(offchainUri), integer(linkedProposal), integer(acceptanceRate), integer(quorum)
+        );
     }
 
     public TransactionBuilder endorseProposal(int id, Hash160 endorser) {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
index 9811791..450d96c 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
@@ -37,8 +37,9 @@ public Map<Hash160, BigInteger> getWhitelistedTokens() throws IOException {
         Map<StackItem, StackItem> map = callInvokeFunction(getMethodName())
                 .getInvocationResult().getStack().get(0).getMap();
         return map.entrySet().stream().collect(Collectors.toMap(
-                e -> Hash160.fromAddress(e.getKey().getAddress()),
-                e -> e.getValue().getInteger())
+                        e -> Hash160.fromAddress(e.getKey().getAddress()),
+                        e -> e.getValue().getInteger()
+                )
         );
     }
 
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java b/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
index d844d64..eab6f1e 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
@@ -24,12 +24,14 @@ public IntentParam(Hash160 targetContract, String method, ContractParameter... p
     public static IntentParam releaseTokenProposal(Hash160 treasury, Hash160 token, Hash160 receiver,
             BigInteger amount) {
         return new IntentParam(treasury, "releaseTokens",
-                hash160(token), hash160(receiver), integer(amount));
+                hash160(token), hash160(receiver), integer(amount)
+        );
     }
 
     public static IntentParam changeParamProposal(Hash160 gov, String paramName, int value) {
         return new IntentParam(gov, "changeParam",
-                string(paramName), integer(value));
+                string(paramName), integer(value)
+        );
     }
 
     public static IntentParam addMemberProposal(Hash160 gov, ECPublicKey pubKey) {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java b/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
index 40d3fad..ac29193 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
@@ -72,7 +72,8 @@ public ProposalStruct(int id, Hash160 proposer, int linkedProposal, int acceptan
         this.abstain = abstain;
         this.voters = voters.entrySet().stream().collect(Collectors.toMap(
                 e -> e.getKey().getAddress(),
-                e -> e.getValue().getInteger().intValue()));
+                e -> e.getValue().getInteger().intValue()
+        ));
     }
 
     public static class IntentStruct {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java b/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
index d420e0d..8e63771 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
@@ -47,7 +47,9 @@ public static ContractParameter prepareDeployParameter(Account... members) {
                         ParameterNames.EXPIRATION_LENGTH_KEY, ParameterValues.PHASE_LENGTH * 1000,
                         ParameterNames.MIN_ACCEPTANCE_RATE_KEY, ParameterValues.MIN_ACCEPTANCE_RATE,
                         ParameterNames.MIN_QUORUM_KEY, ParameterValues.MIN_QUORUM,
-                        ParameterNames.MULTI_SIG_THRESHOLD_KEY, ParameterValues.MULTI_SIG_THRESHOLD_RATIO));
+                        ParameterNames.MULTI_SIG_THRESHOLD_KEY, ParameterValues.MULTI_SIG_THRESHOLD_RATIO
+                )
+        );
     }
 
     public static Hash256 createSimpleProposal(SmartContract contract, Account proposer, String offchainUri)
@@ -55,7 +57,9 @@ public static Hash256 createSimpleProposal(SmartContract contract, Account propo
 
         return contract.invokeFunction(GovernanceMethods.CREATE, hash160(proposer),
                         array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
-                                CallFlags.ALL.getValue())), string(offchainUri), integer(-1))
+                                CallFlags.ALL.getValue()
+                        )), string(offchainUri), integer(-1)
+                )
                 .signers(AccountSigner.calledByEntry(proposer)).sign().send().getSendRawTransaction().getHash();
     }
 
@@ -63,7 +67,8 @@ public static int createAndEndorseProposal(GrantSharesGovContract gov, Neow3j ne
             Account endorser, ContractParameter intents, String offchainUri)
             throws Throwable {
         TransactionBuilder b = gov.invokeFunction(GovernanceMethods.CREATE, hash160(proposer), intents,
-                string(offchainUri), integer(-1));
+                string(offchainUri), integer(-1)
+        );
         return sendAndEndorseProposal(gov, neow3j, proposer, endorser, b);
     }
 
@@ -71,7 +76,8 @@ public static int createAndEndorseProposal(GrantSharesGovContract gov, Neow3j ne
             Account endorser, ContractParameter intents, String offchainUri, int acceptanceRate, int quorum)
             throws Throwable {
         TransactionBuilder b = gov.invokeFunction(GovernanceMethods.CREATE, hash160(proposer), intents,
-                string(offchainUri), integer(-1), integer(acceptanceRate), integer(quorum));
+                string(offchainUri), integer(-1), integer(acceptanceRate), integer(quorum)
+        );
 
         return sendAndEndorseProposal(gov, neow3j, proposer, endorser, b);
     }