forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Access List State Test Support for evmtool (hyperledger#1945)
Update reference test hash for access list tests. Signed-off-by: Ratan Rai Sur <ratan.r.sur@gmail.com>
- Loading branch information
Showing
18 changed files
with
333 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...re/src/main/java/org/hyperledger/besu/ethereum/core/json/AccessListEntryDeserializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.hyperledger.besu.ethereum.core.json; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkState; | ||
|
|
||
| import org.hyperledger.besu.ethereum.core.AccessListEntry; | ||
| import org.hyperledger.besu.ethereum.core.Address; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.core.JsonToken; | ||
| import com.fasterxml.jackson.databind.DeserializationContext; | ||
| import com.fasterxml.jackson.databind.deser.std.StdDeserializer; | ||
| import org.apache.tuweni.bytes.Bytes32; | ||
|
|
||
| public class AccessListEntryDeserializer extends StdDeserializer<AccessListEntry> { | ||
| private AccessListEntryDeserializer() { | ||
| this(null); | ||
| } | ||
|
|
||
| protected AccessListEntryDeserializer(final Class<?> vc) { | ||
| super(vc); | ||
| } | ||
|
|
||
| @Override | ||
| public AccessListEntry deserialize(final JsonParser p, final DeserializationContext ctxt) | ||
| throws IOException { | ||
| checkState(p.nextFieldName().equals("address")); | ||
| final Address address = Address.fromHexString(p.nextTextValue()); | ||
| checkState(p.nextFieldName().equals("storageKeys")); | ||
| checkState(p.nextToken().equals(JsonToken.START_ARRAY)); | ||
| final ArrayList<Bytes32> storageKeys = new ArrayList<>(); | ||
| while (!p.nextToken().equals(JsonToken.END_ARRAY)) { | ||
| storageKeys.add(Bytes32.fromHexString(p.getText())); | ||
| } | ||
| p.nextToken(); // consume end of object | ||
| return new AccessListEntry(address, storageKeys); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...core/src/main/java/org/hyperledger/besu/ethereum/core/json/AccessListEntrySerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.core.json; | ||
|
|
||
| import org.hyperledger.besu.ethereum.core.AccessListEntry; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
|
|
||
| import com.fasterxml.jackson.core.JsonGenerator; | ||
| import com.fasterxml.jackson.databind.SerializerProvider; | ||
| import com.fasterxml.jackson.databind.ser.std.StdSerializer; | ||
| import org.apache.tuweni.bytes.Bytes32; | ||
|
|
||
| public class AccessListEntrySerializer extends StdSerializer<AccessListEntry> { | ||
|
|
||
| AccessListEntrySerializer() { | ||
| this(null); | ||
| } | ||
|
|
||
| protected AccessListEntrySerializer(final Class<AccessListEntry> t) { | ||
| super(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void serialize( | ||
| final AccessListEntry accessListEntry, | ||
| final JsonGenerator gen, | ||
| final SerializerProvider provider) | ||
| throws IOException { | ||
| gen.writeStartObject(); | ||
| gen.writeFieldName("address"); | ||
| gen.writeString(accessListEntry.getAddress().toHexString()); | ||
| gen.writeFieldName("storageKeys"); | ||
| final List<Bytes32> storageKeys = accessListEntry.getStorageKeys(); | ||
| gen.writeArray( | ||
| storageKeys.stream().map(Bytes32::toHexString).toArray(String[]::new), | ||
| 0, | ||
| storageKeys.size()); | ||
| gen.writeEndObject(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.