fix spotless and assemble hopefully

Consensys · Oct 1, 2024 · 60d945f · 60d945f
1 parent d34da85
commit 60d945f
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 56 deletions.
diff --git a/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java b/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java
@@ -280,7 +280,7 @@ private SafeFuture<Void> setExecutionData(
     if (bodyBuilder.supportsExecutionRequests()) {
       bodyBuilder.executionRequests(
           new ExecutionRequestsBuilderElectra(
-              SchemaDefinitionsElectra.required(schemaDefinitions).getExecutionRequestsSchema())
+                  SchemaDefinitionsElectra.required(schemaDefinitions).getExecutionRequestsSchema())
               .build());
     }
 

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/SpecVersion.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/SpecVersion.java
@@ -156,7 +156,8 @@ static SpecVersion createElectra(
     return new SpecVersion(SpecMilestone.ELECTRA, specConfig, schemaDefinitions, specLogic);
   }
 
-  static SpecVersion createEip7732(final SpecConfigEip7732 specConfig, final SchemaRegistryBuilder schemaRegistryBuilder) {
+  static SpecVersion createEip7732(
+      final SpecConfigEip7732 specConfig, final SchemaRegistryBuilder schemaRegistryBuilder) {
     final SchemaRegistry schemaRegistry =
         schemaRegistryBuilder.build(SpecMilestone.EIP7732, specConfig);
     final SchemaDefinitionsEip7732 schemaDefinitions = new SchemaDefinitionsEip7732(schemaRegistry);

diff --git a/...n/java/tech/pegasys/teku/spec/datastructures/blocks/blockbody/BeaconBlockBodyBuilder.java b/...n/java/tech/pegasys/teku/spec/datastructures/blocks/blockbody/BeaconBlockBodyBuilder.java
@@ -20,8 +20,8 @@
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.altair.SyncAggregate;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeader;
-import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequests;
 import tech.pegasys.teku.spec.datastructures.execution.SignedExecutionPayloadHeader;
+import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequests;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.Deposit;

diff --git a/...ku/spec/datastructures/blocks/blockbody/versions/phase0/BeaconBlockBodyBuilderPhase0.java b/...ku/spec/datastructures/blocks/blockbody/versions/phase0/BeaconBlockBodyBuilderPhase0.java
@@ -27,8 +27,8 @@
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.altair.SyncAggregate;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeader;
-import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequests;
 import tech.pegasys.teku.spec.datastructures.execution.SignedExecutionPayloadHeader;
+import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequests;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.Deposit;

diff --git a/...asys/teku/spec/datastructures/execution/versions/eip7732/ExecutionPayloadEip7732Impl.java b/...asys/teku/spec/datastructures/execution/versions/eip7732/ExecutionPayloadEip7732Impl.java
@@ -34,46 +34,46 @@
 
 public class ExecutionPayloadEip7732Impl
     extends Container17<
-            ExecutionPayloadEip7732Impl,
-            SszBytes32,
-            SszByteVector,
-            SszBytes32,
-            SszBytes32,
-            SszByteVector,
-            SszBytes32,
-            SszUInt64,
-            SszUInt64,
-            SszUInt64,
-            SszUInt64,
-            SszByteList,
-            SszUInt256,
-            SszBytes32,
-            SszList<Transaction>,
-            SszList<Withdrawal>,
-            SszUInt64,
-            SszUInt64>
+        ExecutionPayloadEip7732Impl,
+        SszBytes32,
+        SszByteVector,
+        SszBytes32,
+        SszBytes32,
+        SszByteVector,
+        SszBytes32,
+        SszUInt64,
+        SszUInt64,
+        SszUInt64,
+        SszUInt64,
+        SszByteList,
+        SszUInt256,
+        SszBytes32,
+        SszList<Transaction>,
+        SszList<Withdrawal>,
+        SszUInt64,
+        SszUInt64>
     implements ExecutionPayloadEip7732 {
 
   public ExecutionPayloadEip7732Impl(
       final ContainerSchema17<
-                    ExecutionPayloadEip7732Impl,
-                    SszBytes32,
-                    SszByteVector,
-                    SszBytes32,
-                    SszBytes32,
-                    SszByteVector,
-                    SszBytes32,
-                    SszUInt64,
-                    SszUInt64,
-                    SszUInt64,
-                    SszUInt64,
-                    SszByteList,
-                    SszUInt256,
-                    SszBytes32,
-                    SszList<Transaction>,
-                    SszList<Withdrawal>,
-                    SszUInt64,
-                    SszUInt64>
+              ExecutionPayloadEip7732Impl,
+              SszBytes32,
+              SszByteVector,
+              SszBytes32,
+              SszBytes32,
+              SszByteVector,
+              SszBytes32,
+              SszUInt64,
+              SszUInt64,
+              SszUInt64,
+              SszUInt64,
+              SszByteList,
+              SszUInt256,
+              SszBytes32,
+              SszList<Transaction>,
+              SszList<Withdrawal>,
+              SszUInt64,
+              SszUInt64>
           schema,
       final TreeNode backingNode) {
     super(schema, backingNode);
@@ -226,8 +226,6 @@ public UInt64 getExcessBlobGas() {
 
   @Override
   public List<TreeNode> getUnblindedTreeNodes() {
-    return List.of(
-        getTransactions().getBackingNode(),
-        getWithdrawals().getBackingNode());
+    return List.of(getTransactions().getBackingNode(), getWithdrawals().getBackingNode());
   }
 }
diff --git a/.../main/java/tech/pegasys/teku/spec/logic/versions/eip7732/block/BlockProcessorEip7732.java b/.../main/java/tech/pegasys/teku/spec/logic/versions/eip7732/block/BlockProcessorEip7732.java
@@ -303,5 +303,5 @@ public ExecutionPayloadHeader extractExecutionPayloadHeader(final BeaconBlockBod
     return null;
   }
 
-  //EIP7732 TODO: remove processStuff
+  // EIP7732 TODO: remove processStuff
 }
diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecVersionTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecVersionTest.java
@@ -82,6 +82,13 @@ void shouldCreateSpec(final SpecMilestone milestone) {
         actualVersion =
             SpecVersion.create(SpecMilestone.ELECTRA, minimalConfig, schemaRegistryBuilder);
       }
+      case EIP7732 -> {
+        expectedVersion =
+            SpecVersion.createEip7732(
+                SpecConfigEip7732.required(minimalConfig), schemaRegistryBuilder);
+        actualVersion =
+            SpecVersion.create(SpecMilestone.EIP7732, minimalConfig, schemaRegistryBuilder);
+      }
     }
 
     assertThat(actualVersion).isPresent();
@@ -91,16 +98,4 @@ void shouldCreateSpec(final SpecMilestone milestone) {
     assertThat(actualVersion.get().getSchemaDefinitions().getSchemaRegistry().getMilestone())
         .isSameAs(milestone);
   }
-
-  @Test
-  void shouldCreateEip7732Spec() {
-    final SpecConfigEip7732 eip7732SpecConfig = SpecConfigEip7732.required(minimalConfig);
-    final SpecVersion expectedVersion = SpecVersion.createEip7732(eip7732SpecConfig);
-    final Optional<SpecVersion> actualVersion =
-        SpecVersion.create(SpecMilestone.EIP7732, minimalConfig);
-    assertThat(actualVersion).isPresent();
-    assertThat(actualVersion.get().getMilestone()).isEqualTo(SpecMilestone.EIP7732);
-    assertThat(actualVersion.get().getSchemaDefinitions())
-        .hasSameClassAs(expectedVersion.getSchemaDefinitions());
-  }
 }