Fixed merge errors

Author: rpanic

packages/protocol/test/TestingProtocol.ts

@@ -33,10 +33,6 @@ export function createAndInitTestingProtocol() {
     LastStateRoot: {},
   });
 
-  protocol.registerValue({
-    StateServiceProvider: new StateServiceProvider(),
-  });
-
   const appChain = container.createChildContainer();
 
   appChain.register("Runtime", {
@@ -53,5 +49,9 @@ export function createAndInitTestingProtocol() {
   });
   protocol.create(() => appChain.createChildContainer());
 
+  protocol.registerValue({
+    StateServiceProvider: new StateServiceProvider(),
+  });
+
   return protocol;
 }

packages/protocol/test/model/StateTransitionProvableBatch.test.ts

@@ -1,3 +1,4 @@
+import "reflect-metadata";
 import { Bool, Field } from "o1js";
 
 import {

packages/protocol/test/prover/block/BlockProver.test.ts

@@ -12,3 +12,7 @@
  */
 
 /* eslint-enable max-len */
+
+it("dummy", () => {
+  expect(1).toBe(1);
+});

packages/protocol/test/utils/ProvableHashList.test.ts

@@ -1,3 +1,4 @@
+import "reflect-metadata";
 import { Bool, Field, Poseidon } from "o1js";
 
 import { DefaultProvableHashList } from "../../src";

packages/sequencer/test/integration/BlockProduction.test.ts

@@ -331,8 +331,12 @@ describe("block production", () => {
     expect(block!.transactions[0].status.toBoolean()).toBe(true);
     expect(block!.transactions[0].statusMessage).toBeUndefined();
 
-    expect(block!.transactions[0].stateTransitions).toHaveLength(1);
-    expect(block!.transactions[0].protocolTransitions).toHaveLength(2);
+    expect(
+      block!.transactions[0].stateTransitions[0].stateTransitions
+    ).toHaveLength(2);
+    expect(
+      block!.transactions[0].stateTransitions[1].stateTransitions
+    ).toHaveLength(1);
 
     await test.produceBlock();
 

packages/sequencer/test/integration/Mempool.test.ts

@@ -115,7 +115,6 @@ describe.each([["InMemory", InMemoryDatabase]])(
           TaskQueue: {},
           SequencerStartupModule: {},
           ProtocolStartupModule: {},
-          SequencerStartupModule: {},
         },
         Protocol: {
           AccountState: {},