Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
just-mitch committed Mar 13, 2024
1 parent d8ada69 commit 034eb77
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@ describe('public_processor', () => {
baseContractAddressSeed,
baseContractAddressSeed,
].map(makePublicCallRequest);
callRequests[0].callContext.startSideEffectCounter = 2;
callRequests[1].callContext.startSideEffectCounter = 3;
callRequests[2].callContext.startSideEffectCounter = 4;
callRequests[0].callContext.sideEffectCounter = 2;
callRequests[1].callContext.sideEffectCounter = 3;
callRequests[2].callContext.sideEffectCounter = 4;

const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
kernelOutput.end.unencryptedLogsHash = [Fr.ZERO, Fr.ZERO];
Expand Down Expand Up @@ -511,9 +511,9 @@ describe('public_processor', () => {
baseContractAddressSeed,
baseContractAddressSeed,
].map(makePublicCallRequest);
callRequests[0].callContext.startSideEffectCounter = 2;
callRequests[1].callContext.startSideEffectCounter = 3;
callRequests[2].callContext.startSideEffectCounter = 4;
callRequests[0].callContext.sideEffectCounter = 2;
callRequests[1].callContext.sideEffectCounter = 3;
callRequests[2].callContext.sideEffectCounter = 4;

const kernelOutput = makePrivateKernelTailCircuitPublicInputs(0x10);
kernelOutput.end.unencryptedLogsHash = [Fr.ZERO, Fr.ZERO];
Expand Down

0 comments on commit 034eb77

Please sign in to comment.