Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ssz module to infrastructure #4748

Merged
merged 8 commits into from
Dec 5, 2021
Merged

Move ssz module to infrastructure #4748

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0db616d
Move ssz module to infrastructure.
ajsutton Dec 4, 2021
384ede8
Rename package.
ajsutton Dec 5, 2021
89da33a
Spotless.
ajsutton Dec 5, 2021
35b17c7
Fix compile
ajsutton Dec 5, 2021
dd09a4e
Fix reference to ssz:generator
ajsutton Dec 5, 2021
d7862f9
Update templates
ajsutton Dec 5, 2021
bf4390a
Fix test
ajsutton Dec 5, 2021
f838a07
Merge branch 'master' into ssz-infrastructure
ajsutton Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update templates
  • Loading branch information
@ajsutton
ajsutton committed Dec 5, 2021
commit d7862f94f811c0cee6d13920b18979c19f7df637
6 changes: 3 additions & 3 deletions ...pegasys/teku/ssz/ContainersGenerator.java → ...tructure/ssz/ssz/ContainersGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* specific language governing permissions and limitations under the License.
*/

package tech.pegasys.teku.ssz;
package tech.pegasys.teku.infrastructure.ssz.ssz;

import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -26,8 +26,8 @@ public class ContainersGenerator {
private final int maxFields = 16;
private final Path templateSrcPath;
private final Path targetSrcPath;
private final String typePackagePath = "tech/pegasys/teku/ssz/containers/";
private final String viewPackagePath = "tech/pegasys/teku/ssz/containers/";
private final String typePackagePath = "tech/pegasys/teku/infrastructure/ssz/containers/";
private final String viewPackagePath = "tech/pegasys/teku/infrastructure/ssz/containers/";
private final String containerTypeTemplateFile = "ContainerSchemaTemplate.java";
private final String containerViewTemplateFile = "ContainerTemplate.java";

Expand Down
12 changes: 6 additions & 6 deletions ...z/containers/ContainerSchemaTemplate.java → ...z/containers/ContainerSchemaTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* specific language governing permissions and limitations under the License.
*/

package tech.pegasys.teku.ssz.containers;
package tech.pegasys.teku.infrastructure.ssz.ssz.containers;

import java.util.List;
import java.util.function.BiFunction;
import tech.pegasys.teku.ssz.SszContainer;
import tech.pegasys.teku.ssz.SszData;
import tech.pegasys.teku.ssz.schema.SszSchema;
import tech.pegasys.teku.ssz.schema.impl.AbstractSszContainerSchema;
import tech.pegasys.teku.ssz.tree.TreeNode;
import tech.pegasys.teku.infrastructure.ssz.SszContainer;
import tech.pegasys.teku.infrastructure.ssz.SszData;
import tech.pegasys.teku.infrastructure.ssz.schema.SszSchema;
import tech.pegasys.teku.infrastructure.ssz.schema.impl.AbstractSszContainerSchema;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;

/** Autogenerated by tech.pegasys.teku.ssz.backing.ContainersGenerator */
public abstract class /*$$TypeClassName*/ ContainerSchemaTemplate /*$$*/<
Expand Down
8 changes: 4 additions & 4 deletions ...eku/ssz/containers/ContainerTemplate.java → ...ssz/ssz/containers/ContainerTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* specific language governing permissions and limitations under the License.
*/

package tech.pegasys.teku.ssz.containers;
package tech.pegasys.teku.infrastructure.ssz.ssz.containers;

import tech.pegasys.teku.ssz.SszData;
import tech.pegasys.teku.ssz.impl.AbstractSszImmutableContainer;
import tech.pegasys.teku.ssz.tree.TreeNode;
import tech.pegasys.teku.infrastructure.ssz.SszData;
import tech.pegasys.teku.infrastructure.ssz.impl.AbstractSszImmutableContainer;
import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;

/** Autogenerated by tech.pegasys.teku.ssz.backing.ContainersGenerator */
public class /*$$ViewClassName*/ ContainerTemplate /*$$*/<
Expand Down
4 changes: 2 additions & 2 deletions ...ners/GeneratedClassesNotModifiedTest.java → ...ners/GeneratedClassesNotModifiedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* specific language governing permissions and limitations under the License.
*/

package tech.pegasys.teku.ssz.containers;
package tech.pegasys.teku.ssz.infrastructure.containers;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -26,7 +26,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.io.TempDir;
import tech.pegasys.teku.ssz.ContainersGenerator;
import tech.pegasys.teku.infrastructure.ssz.ssz.ContainersGenerator;

public class GeneratedClassesNotModifiedTest {

Expand Down