1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
ZoKrates/stdlib
sdeml 00147b3917 Merge branch 'develop' into add-sharound
* develop: (53 commits)
  move book snippets to files in test folder, link to them from md
  handle case where path is a directory
  update cargo.lock
  update tests to use relative paths
  resolve cargo.lock conflict
  WASM crate import depends on the presence of the `wasm` feature
  Insert missing fi at the end of if statement
  change test to check flattening of 1-sized array is identical to flattening of single value
  implement variable access to ifelse array
  add support for ifelse array access, clean up semantic treatment
  recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already
  add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
  remove commented out old serialization
  branch  based on first path component
  base decision on first character of path
  fallback to /Users/obit/.zokrates when importing source files
  Run the tests with WASM enabled
  Fix build after rebase
  Fix warning
  Move wasm plugin generation to a different repo
  ...

# Conflicts:
#	zokrates_book/src/sha256example.md
2019-01-23 17:43:14 +01:00
..
merkle_tree fix tests 2019-01-18 14:52:28 +01:00
sha256 new test fails 2019-01-17 17:29:46 +01:00
utils add merke-tree inclusion proof 2019-01-17 17:35:58 +01:00
fortytwo.code add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file 2019-01-16 17:58:46 +01:00