Skip to content

Commit

Permalink
fix: vibes
Browse files Browse the repository at this point in the history
  • Loading branch information
ludamad0 committed Jan 12, 2024
1 parent c3e2183 commit bb25113
Show file tree
Hide file tree
Showing 29 changed files with 124 additions and 124 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ cycle_group<C> pedersen_commitment<C>::commit(const std::vector<std::pair<field_
return cycle_group::batch_mul(scalars, points);
}

template class pedersen_commitment<proof_system ::StandardCircuitBuilder>;
template class pedersen_commitment<proof_system ::UltraCircuitBuilder>;
template class pedersen_commitment<proof_system ::GoblinUltraCircuitBuilder>;
template class pedersen_commitment<proof_system::StandardCircuitBuilder>;
template class pedersen_commitment<proof_system::UltraCircuitBuilder>;
template class pedersen_commitment<proof_system::GoblinUltraCircuitBuilder>;

} // namespace proof_system::plonk::stdlib
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder
return result;
}

template byte_array<proof_system ::StandardCircuitBuilder> blake2s(
const byte_array<proof_system ::StandardCircuitBuilder>& input);
template byte_array<proof_system ::UltraCircuitBuilder> blake2s(
const byte_array<proof_system ::UltraCircuitBuilder>& input);
template byte_array<proof_system ::GoblinUltraCircuitBuilder> blake2s(
const byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template byte_array<proof_system::StandardCircuitBuilder> blake2s(
const byte_array<proof_system::StandardCircuitBuilder>& input);
template byte_array<proof_system::UltraCircuitBuilder> blake2s(
const byte_array<proof_system::UltraCircuitBuilder>& input);
template byte_array<proof_system::GoblinUltraCircuitBuilder> blake2s(
const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ template <typename Builder> byte_array<Builder> blake2s(const byte_array<Builder
return result;
}

template byte_array<proof_system ::UltraCircuitBuilder> blake2s(
const byte_array<proof_system ::UltraCircuitBuilder>& input);
template byte_array<proof_system ::GoblinUltraCircuitBuilder> blake2s(
const byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template byte_array<proof_system::UltraCircuitBuilder> blake2s(
const byte_array<proof_system::UltraCircuitBuilder>& input);
template byte_array<proof_system::GoblinUltraCircuitBuilder> blake2s(
const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);

} // namespace blake2s_plookup

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder
return result;
}

template byte_array<proof_system ::StandardCircuitBuilder> blake3s(
const byte_array<proof_system ::StandardCircuitBuilder>& input);
template byte_array<proof_system ::UltraCircuitBuilder> blake3s(
const byte_array<proof_system ::UltraCircuitBuilder>& input);
template byte_array<proof_system ::GoblinUltraCircuitBuilder> blake3s(
const byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template byte_array<proof_system::StandardCircuitBuilder> blake3s(
const byte_array<proof_system::StandardCircuitBuilder>& input);
template byte_array<proof_system::UltraCircuitBuilder> blake3s(
const byte_array<proof_system::UltraCircuitBuilder>& input);
template byte_array<proof_system::GoblinUltraCircuitBuilder> blake3s(
const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,10 @@ template <typename Builder> byte_array<Builder> blake3s(const byte_array<Builder
return result;
}

template byte_array<proof_system ::UltraCircuitBuilder> blake3s(
const byte_array<proof_system ::UltraCircuitBuilder>& input);
template byte_array<proof_system ::GoblinUltraCircuitBuilder> blake3s(
const byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template byte_array<proof_system::UltraCircuitBuilder> blake3s(
const byte_array<proof_system::UltraCircuitBuilder>& input);
template byte_array<proof_system::GoblinUltraCircuitBuilder> blake3s(
const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
} // namespace blake3s_plookup

} // namespace stdlib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ field_t<C> pedersen_hash<C>::hash_buffer(const stdlib::byte_array<C>& input, Gen
}
return hashed;
}
template class pedersen_hash<proof_system ::StandardCircuitBuilder>;
template class pedersen_hash<proof_system ::UltraCircuitBuilder>;
template class pedersen_hash<proof_system ::GoblinUltraCircuitBuilder>;
template class pedersen_hash<proof_system::StandardCircuitBuilder>;
template class pedersen_hash<proof_system::UltraCircuitBuilder>;
template class pedersen_hash<proof_system::GoblinUltraCircuitBuilder>;

} // namespace proof_system::plonk::stdlib
24 changes: 12 additions & 12 deletions barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,17 @@ template <typename Builder> packed_byte_array<Builder> sha256(const packed_byte_
return packed_byte_array<Builder>(output, 4);
}

template byte_array<proof_system ::StandardCircuitBuilder> sha256_block(
const byte_array<proof_system ::StandardCircuitBuilder>& input);
template byte_array<proof_system ::UltraCircuitBuilder> sha256_block(
const byte_array<proof_system ::UltraCircuitBuilder>& input);
template byte_array<proof_system ::GoblinUltraCircuitBuilder> sha256_block(
const byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template packed_byte_array<proof_system ::StandardCircuitBuilder> sha256(
const packed_byte_array<proof_system ::StandardCircuitBuilder>& input);
template packed_byte_array<proof_system ::UltraCircuitBuilder> sha256(
const packed_byte_array<proof_system ::UltraCircuitBuilder>& input);
template packed_byte_array<proof_system ::GoblinUltraCircuitBuilder> sha256(
const packed_byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template byte_array<proof_system::StandardCircuitBuilder> sha256_block(
const byte_array<proof_system::StandardCircuitBuilder>& input);
template byte_array<proof_system::UltraCircuitBuilder> sha256_block(
const byte_array<proof_system::UltraCircuitBuilder>& input);
template byte_array<proof_system::GoblinUltraCircuitBuilder> sha256_block(
const byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
template packed_byte_array<proof_system::StandardCircuitBuilder> sha256(
const packed_byte_array<proof_system::StandardCircuitBuilder>& input);
template packed_byte_array<proof_system::UltraCircuitBuilder> sha256(
const packed_byte_array<proof_system::UltraCircuitBuilder>& input);
template packed_byte_array<proof_system::GoblinUltraCircuitBuilder> sha256(
const packed_byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,10 @@ template <typename Builder> packed_byte_array<Builder> sha256(const packed_byte_
return packed_byte_array<Builder>(output, 4);
}

template packed_byte_array<proof_system ::UltraCircuitBuilder> sha256(
const packed_byte_array<proof_system ::UltraCircuitBuilder>& input);
template packed_byte_array<proof_system ::GoblinUltraCircuitBuilder> sha256(
const packed_byte_array<proof_system ::GoblinUltraCircuitBuilder>& input);
template packed_byte_array<proof_system::UltraCircuitBuilder> sha256(
const packed_byte_array<proof_system::UltraCircuitBuilder>& input);
template packed_byte_array<proof_system::GoblinUltraCircuitBuilder> sha256(
const packed_byte_array<proof_system::GoblinUltraCircuitBuilder>& input);
} // namespace sha256_plookup
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ template <typename Builder> std::string bit_array<Builder>::get_witness_as_strin
return output;
}

template class bit_array<proof_system ::StandardCircuitBuilder>;
template class bit_array<proof_system ::UltraCircuitBuilder>;
template class bit_array<proof_system ::GoblinUltraCircuitBuilder>;
template class bit_array<proof_system::StandardCircuitBuilder>;
template class bit_array<proof_system::UltraCircuitBuilder>;
template class bit_array<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,9 @@ template <typename Builder> bool_t<Builder> bool_t<Builder>::normalize() const
return *this;
}

template class bool_t<proof_system ::StandardCircuitBuilder>;
template class bool_t<proof_system ::UltraCircuitBuilder>;
template class bool_t<proof_system ::GoblinUltraCircuitBuilder>;
template class bool_t<proof_system::StandardCircuitBuilder>;
template class bool_t<proof_system::UltraCircuitBuilder>;
template class bool_t<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@ typename byte_array<Builder>::byte_slice byte_array<Builder>::split_byte(const s
return { low, scaled_high, bit };
}

template class byte_array<proof_system ::StandardCircuitBuilder>;
template class byte_array<proof_system ::UltraCircuitBuilder>;
template class byte_array<proof_system ::GoblinUltraCircuitBuilder>;
template class byte_array<proof_system::StandardCircuitBuilder>;
template class byte_array<proof_system::UltraCircuitBuilder>;
template class byte_array<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -1146,9 +1146,9 @@ std::vector<bool_t<Builder>> field_t<Builder>::decompose_into_bits(
return result;
}

template class field_t<proof_system ::StandardCircuitBuilder>;
template class field_t<proof_system ::UltraCircuitBuilder>;
template class field_t<proof_system ::GoblinUltraCircuitBuilder>;
template class field_t<proof_system::StandardCircuitBuilder>;
template class field_t<proof_system::UltraCircuitBuilder>;
template class field_t<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -1358,8 +1358,8 @@ template <typename Composer> cycle_group<Composer> cycle_group<Composer>::operat
throw_or_abort("Implementation under construction...");
}

template class cycle_group<proof_system ::StandardCircuitBuilder>;
template class cycle_group<proof_system ::UltraCircuitBuilder>;
template class cycle_group<proof_system ::GoblinUltraCircuitBuilder>;
template class cycle_group<proof_system::StandardCircuitBuilder>;
template class cycle_group<proof_system::UltraCircuitBuilder>;
template class cycle_group<proof_system::GoblinUltraCircuitBuilder>;

} // namespace proof_system::plonk::stdlib
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ field_t<Builder> logic<Builder>::create_logic_constraint(
return field_t<Builder>::from_witness_index(ctx, out_idx);
}
}
template class logic<proof_system ::StandardCircuitBuilder>;
template class logic<proof_system ::UltraCircuitBuilder>;
template class logic<proof_system ::GoblinUltraCircuitBuilder>;
template class logic<proof_system::StandardCircuitBuilder>;
template class logic<proof_system::UltraCircuitBuilder>;
template class logic<proof_system::GoblinUltraCircuitBuilder>;
} // namespace proof_system::plonk::stdlib
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ template <typename Builder> void DynamicArray<Builder>::conditional_pop(const bo
_length -= predicate;
}

template class DynamicArray<proof_system ::UltraCircuitBuilder>;
template class DynamicArray<proof_system ::GoblinUltraCircuitBuilder>;
template class DynamicArray<proof_system::UltraCircuitBuilder>;
template class DynamicArray<proof_system::GoblinUltraCircuitBuilder>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ template <typename Builder> void ram_table<Builder>::write(const field_pt& index
}
}

template class ram_table<proof_system ::UltraCircuitBuilder>;
template class ram_table<proof_system ::GoblinUltraCircuitBuilder>;
template class ram_table<proof_system::UltraCircuitBuilder>;
template class ram_table<proof_system::GoblinUltraCircuitBuilder>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ template <typename Builder> field_t<Builder> rom_table<Builder>::operator[](cons
return field_pt::from_witness_index(context, output_idx);
}

template class rom_table<proof_system ::UltraCircuitBuilder>;
template class rom_table<proof_system ::GoblinUltraCircuitBuilder>;
template class rom_table<proof_system::UltraCircuitBuilder>;
template class rom_table<proof_system::GoblinUltraCircuitBuilder>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ std::array<field_t<Builder>, 2> twin_rom_table<Builder>::operator[](const field_
};
}

template class twin_rom_table<proof_system ::UltraCircuitBuilder>;
template class twin_rom_table<proof_system ::GoblinUltraCircuitBuilder>;
template class twin_rom_table<proof_system::UltraCircuitBuilder>;
template class twin_rom_table<proof_system::GoblinUltraCircuitBuilder>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ template <typename Builder> std::string packed_byte_array<Builder>::get_value()
return bytes;
}

template class packed_byte_array<proof_system ::StandardCircuitBuilder>;
template class packed_byte_array<proof_system ::UltraCircuitBuilder>;
template class packed_byte_array<proof_system ::GoblinUltraCircuitBuilder>;
template class packed_byte_array<proof_system::StandardCircuitBuilder>;
template class packed_byte_array<proof_system::UltraCircuitBuilder>;
template class packed_byte_array<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ field_t<Builder> plookup_read<Builder>::read_from_1_to_2_table(const MultiTableI
return lookup[ColumnIdx::C2][0];
}

template class plookup_read<proof_system ::UltraCircuitBuilder>;
template class plookup_read<proof_system ::GoblinUltraCircuitBuilder>;
template class plookup_read<proof_system::UltraCircuitBuilder>;
template class plookup_read<proof_system::GoblinUltraCircuitBuilder>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ std::array<safe_uint_t<Builder>, 3> safe_uint_t<Builder>::slice(const uint8_t ms
return result;
}

template class safe_uint_t<proof_system ::StandardCircuitBuilder>;
template class safe_uint_t<proof_system ::UltraCircuitBuilder>;
template class safe_uint_t<proof_system ::GoblinUltraCircuitBuilder>;
template class safe_uint_t<proof_system::StandardCircuitBuilder>;
template class safe_uint_t<proof_system::UltraCircuitBuilder>;
template class safe_uint_t<proof_system::GoblinUltraCircuitBuilder>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -391,10 +391,10 @@ std::pair<uint<Builder, Native>, uint<Builder, Native>> uint<Builder, Native>::d
return std::make_pair(quotient, remainder);
}

template class uint<proof_system ::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint64_t>;
template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system::StandardCircuitBuilder, uint64_t>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ template <typename Builder, typename Native> bool_t<Builder> uint<Builder, Nativ
return (field_t<Builder>(*this).is_zero()).normalize();
}

template class uint<proof_system ::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint64_t>;
template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system::StandardCircuitBuilder, uint64_t>;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,10 @@ uint<Builder, Native> uint<Builder, Native>::logic_operator(const uint& other, c
return result;
}

template class uint<proof_system ::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system ::StandardCircuitBuilder, uint64_t>;
template class uint<proof_system::StandardCircuitBuilder, uint8_t>;
template class uint<proof_system::StandardCircuitBuilder, uint16_t>;
template class uint<proof_system::StandardCircuitBuilder, uint32_t>;
template class uint<proof_system::StandardCircuitBuilder, uint64_t>;

} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,14 @@ std::pair<uint_plookup<Builder, Native>, uint_plookup<Builder, Native>> uint_plo

return std::make_pair(quotient, remainder);
}
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
;
} // namespace stdlib
} // namespace proof_system::plonk
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ template <typename Builder, typename Native> bool_t<Builder> uint_plookup<Builde
return (field_t<Builder>(*this).is_zero()).normalize();
}

template class uint_plookup<proof_system ::UltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system ::UltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system ::GoblinUltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint8_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint16_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint32_t>;
template class uint_plookup<proof_system::UltraCircuitBuilder, uint64_t>;
template class uint_plookup<proof_system::GoblinUltraCircuitBuilder, uint64_t>;
} // namespace stdlib
} // namespace proof_system::plonk
Loading

0 comments on commit bb25113

Please sign in to comment.