Skip to content

Commit

Permalink
drop deprecated boolean "constant" from Function JSON;
Browse files Browse the repository at this point in the history
see stateMutability;
  • Loading branch information
esaulpaugh committed May 14, 2022
1 parent 85f5cea commit 3283bcf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
2 changes: 0 additions & 2 deletions src/main/java/com/esaulpaugh/headlong/abi/ABIJSON.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ private ABIJSON() {}
private static final String VIEW = "view";
static final String PAYABLE = "payable";
// private static final String NONPAYABLE = "nonpayable";// to mark as nonpayable, do not specify any stateMutability
private static final String CONSTANT = "constant"; // deprecated

public static Function parseFunction(String objectJson) {
return parseFunction(parseObject(objectJson));
Expand Down Expand Up @@ -292,7 +291,6 @@ private static void stateMutability(JsonWriter out, String stateMutability) thro
if(stateMutability != null) {
out.name(STATE_MUTABILITY).value(stateMutability);
}
out.name(CONSTANT).value(VIEW.equals(stateMutability) || PURE.equals(stateMutability));
}

private static void tupleType(JsonWriter out, String name, TupleType tupleType, boolean[] indexedManifest) throws IOException {
Expand Down
18 changes: 6 additions & 12 deletions src/test/java/com/esaulpaugh/headlong/abi/ABIJSONTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ public class ABIJSONTest {
" \"name\": \"count\",\n" +
" \"type\": \"uint64\"\n" +
" }\n" +
" ],\n" +
" \"constant\": false\n" +
" ]\n" +
"}";

private static final String FUNCTION_B_JSON = "{\n" +
Expand Down Expand Up @@ -120,8 +119,7 @@ public class ABIJSONTest {
" }\n" +
" ],\n" +
" \"outputs\": [],\n" +
" \"stateMutability\": \"view\",\n" +
" \"constant\": true\n" +
" \"stateMutability\": \"view\"\n" +
"}";

private static final String CONTRACT_JSON = "[\n" +
Expand Down Expand Up @@ -192,16 +190,14 @@ public class ABIJSONTest {
" ]\n" +
" }\n" +
" ],\n" +
" \"outputs\": [],\n" +
" \"constant\": false\n" +
" \"outputs\": []\n" +
" }\n" +
"]";

private static final String FALLBACK_CONSTRUCTOR_RECEIVE = "[\n" +
" {\n" +
" \"type\": \"fallback\",\n" +
" \"stateMutability\": \"pure\",\n" +
" \"constant\": true\n" +
" \"stateMutability\": \"pure\"\n" +
" },\n" +
" {\n" +
" \"type\": \"constructor\",\n" +
Expand All @@ -211,13 +207,11 @@ public class ABIJSONTest {
" \"type\": \"bool\"\n" +
" }\n" +
" ],\n" +
" \"stateMutability\": \"nonpayable\",\n" +
" \"constant\": false\n" +
" \"stateMutability\": \"nonpayable\"\n" +
" },\n" +
" {\n" +
" \"type\": \"receive\",\n" +
" \"stateMutability\": \"payable\",\n" +
" \"constant\": false\n" +
" \"stateMutability\": \"payable\"\n" +
" }\n" +
"]";

Expand Down

0 comments on commit 3283bcf

Please sign in to comment.