Skip to content

Commit

Permalink
merging main
Browse files Browse the repository at this point in the history
  • Loading branch information
45930 committed Sep 14, 2023
2 parents 362276d + 14ee205 commit f43a87a
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ module.exports = {
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:snarkyjs/recommended',
'plugin:o1js/recommended',
],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['@typescript-eslint', 'snarkyjs'],
plugins: ['@typescript-eslint', 'o1js'],
ignorePatterns: ['README.md'],
rules: {
'no-constant-condition': 'off',
Expand Down
4 changes: 2 additions & 2 deletions jest-resolver.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ module.exports = (request, options) => {
return options.defaultResolver(request, {
...options,
packageFilter: (pkg) => {
// When importing snarkyjs, we specify the Node ESM import as Jest by default imports the web version
if (pkg.name === 'snarkyjs') {
// When importing o1js, we specify the Node ESM import as Jest by default imports the web version
if (pkg.name === 'o1js') {
return {
...pkg,
main: pkg.exports.node.import,
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default {
},
resolver: '<rootDir>/jest-resolver.cjs',
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!(tslib|snarkyjs/node_modules/tslib))',
'<rootDir>/node_modules/(?!(tslib|o1js/node_modules/tslib))',
],
modulePathIgnorePatterns: ['<rootDir>/build/'],
moduleNameMapper: {
Expand Down
68 changes: 34 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "snarkyjs-pack",
"version": "0.2.3",
"version": "0.3.0",
"description": "",
"author": "45930",
"license": "Apache-2.0",
Expand Down Expand Up @@ -36,7 +36,7 @@
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"eslint": "^8.7.0",
"eslint-plugin-snarkyjs": "^0.1.0",
"eslint-plugin-o1js": "^0.4.0",
"husky": "^7.0.1",
"jest": "^27.3.1",
"lint-staged": "^11.0.1",
Expand All @@ -45,6 +45,6 @@
"typescript": "^4.7.2"
},
"peerDependencies": {
"snarkyjs": "^0.12.1"
"o1js": "^0.12.*"
}
}
2 changes: 1 addition & 1 deletion src/lib/PackingPlant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
provable,
InferProvable,
Provable,
} from 'snarkyjs';
} from 'o1js';

const MAX_BITS_PER_FIELD = 254n;

Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedBool.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Bool, Provable } from 'snarkyjs';
import { Bool, Provable } from 'o1js';
import { PackedBoolFactory } from './PackedBool';

describe('PackedBool', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedBool.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Field, Provable, Bool } from 'snarkyjs';
import { Field, Provable, Bool } from 'o1js';
import { PackingPlant } from '../PackingPlant.js';

const SIZE_IN_BITS = 1n;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedString.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Character, Field, Provable } from 'snarkyjs';
import { Character, Field, Provable } from 'o1js';
import { PackedStringFactory } from './PackedString';

describe('PackedString', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedString.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Field, Provable, Character } from 'snarkyjs';
import { Field, Provable, Character } from 'o1js';
import { MultiPackingPlant } from '../PackingPlant.js';

const SIZE_IN_BITS = 16n;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedUInt32.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Provable, UInt32 } from 'snarkyjs';
import { Provable, UInt32 } from 'o1js';
import { PackedUInt32Factory } from './PackedUInt32';

describe('PackedUInt32', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/packed-types/PackedUInt32.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Field, Provable, UInt32 } from 'snarkyjs';
import { Field, Provable, UInt32 } from 'o1js';
import { PackingPlant } from '../PackingPlant.js';

const SIZE_IN_BITS = 32n;
Expand Down
2 changes: 1 addition & 1 deletion tests/provable/end_to_end.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UInt32 } from 'snarkyjs';
import { UInt32 } from 'o1js';
import { Votes, VotesProgram, VotesProof } from './example_circuit';

describe('End to End Votes Test', () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/provable/example_circuit.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Experimental, SelfProof } from 'snarkyjs';
import { Experimental, SelfProof } from 'o1js';
import { PackedUInt32Factory } from '../../src/lib/packed-types/PackedUInt32';

export class Votes extends PackedUInt32Factory(2) {}
Expand Down

0 comments on commit f43a87a

Please sign in to comment.