32 bit fix

This commit is contained in:
Christien Rioux 2023-09-20 11:31:01 -04:00
parent 0bf595c53a
commit 2627a22597
3 changed files with 7 additions and 9 deletions

View File

@ -30,8 +30,8 @@ elif [[ "$1" == "ios" ]]; then
elif [[ "$1" == "android" ]]; then elif [[ "$1" == "android" ]]; then
ID="$2" ID="$2"
if [[ "$ID" == "" ]]; then if [[ "$ID" == "" ]]; then
echo "No emulator ID specified" echo "No emulator ID specified, trying 'emulator-5554'"
exit 1 ID="emulator-5554"
fi fi
APPNAME=veilid_core_android_tests APPNAME=veilid_core_android_tests
APPID=com.veilid.veilid_core_android_tests APPID=com.veilid.veilid_core_android_tests

View File

@ -22,10 +22,9 @@ impl RPCOperationWatchValueQ {
watcher: PublicKey, watcher: PublicKey,
signature: Signature, signature: Signature,
) -> Result<Self, RPCError> { ) -> Result<Self, RPCError> {
#[cfg(target_arch = "wasm32")] // Needed because RangeSetBlaze uses different types here all the time
#[allow(clippy::unnecessary_cast)]
let subkeys_len = subkeys.len() as usize; let subkeys_len = subkeys.len() as usize;
#[cfg(not(target_arch = "wasm32"))]
let subkeys_len = subkeys.len();
if subkeys_len > MAX_WATCH_VALUE_Q_SUBKEYS_LEN { if subkeys_len > MAX_WATCH_VALUE_Q_SUBKEYS_LEN {
return Err(RPCError::protocol("WatchValueQ subkeys length too long")); return Err(RPCError::protocol("WatchValueQ subkeys length too long"));
@ -42,10 +41,9 @@ impl RPCOperationWatchValueQ {
// signature covers: key, subkeys, expiration, count, using watcher key // signature covers: key, subkeys, expiration, count, using watcher key
fn make_signature_data(&self) -> Vec<u8> { fn make_signature_data(&self) -> Vec<u8> {
#[cfg(target_arch = "wasm32")] // Needed because RangeSetBlaze uses different types here all the time
#[allow(clippy::unnecessary_cast)]
let subkeys_len = self.subkeys.len() as usize; let subkeys_len = self.subkeys.len() as usize;
#[cfg(not(target_arch = "wasm32"))]
let subkeys_len = self.subkeys.len();
let mut sig_data = Vec::with_capacity(PUBLIC_KEY_LENGTH + 4 + (subkeys_len * 8) + 8 + 4); let mut sig_data = Vec::with_capacity(PUBLIC_KEY_LENGTH + 4 + (subkeys_len * 8) + 8 + 4);
sig_data.extend_from_slice(&self.key.kind.0); sig_data.extend_from_slice(&self.key.kind.0);

View File

@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register("clean", Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }