Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic values and tests #26

Merged
merged 5 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 180 additions & 0 deletions solarkraft/src/state/value.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
export type Value = {
type: string
} & (IntValue | BoolValue | SymbValue | AddrValue)

export function isValid(v: Value): boolean {
switch (v.type) {
case "u32": {
const val = (v as IntValue).val
return (0n <= val) && (val <= 2n ** 32n)
}
case "i32": {
const val = (v as IntValue).val
return (-(2n ** 31n) <= val) && (val < (2n ** 31n))
}
case "u64": {
const val = (v as IntValue).val
return (0n <= val) && (val <= 2n ** 64n)
}
case "i64": {
const val = (v as IntValue).val
return (-(2n ** 63n) <= val) && (val < (2n ** 63n))
}
case "u128": {
const val = (v as IntValue).val
return (0n <= val) && (val <= 2n ** 128n)
}
case "i128": {
const val = (v as IntValue).val
return (-(2n ** 127n) <= val) && (val < (2n ** 127n))
}
case "symb": {
const regex: RegExp = /^[a-zA-Z0-9_]{0,32}$/
return regex.test((v as SymbValue).val)
}
case "addr": {
const regex: RegExp = /^[A-Z0-9]{56}$/
return regex.test((v as AddrValue).val)
}
default:
return true

}
}

/**
* Any of the follwing:
* - Unsigned 32-bit Integer (u32)
* - Signed 32-bit Integer (i32)
* - Unsigned 64-bit Integer (u64)
* - Signed 64-bit Integer (i64)
* - Unsigned 128-bit Integer (u128)
* - Signed 128-bit Integer (i128)
*
* Example: 2u32 would be represented as { val: 2, type: "u32" }, whereas 2i32 would be { val: 2, type: "i32" }
*/
export type IntValue = {
val: bigint
} & (IntValue_u32 | IntValue_i32 | IntValue_u64 | IntValue_i64 | IntValue_u128 | IntValue_i128)


function mkInt(type: string, val: bigint) {
const obj = { type: type, val: val } as Value
Kukovec marked this conversation as resolved.
Show resolved Hide resolved
if (!isValid(obj)) {
throw new RangeError(`${val} lies outside the ${type} range.`)
}
return obj
}


// u32
export type IntValue_u32 = {
type: "u32"
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the value of these definitions?


export function u32(v: bigint): Value {
return mkInt("u32", v)
}

// i32
export type IntValue_i32 = {
type: "i32"
}

export function i32(v: bigint): Value {
return mkInt("i32", v)
}

// u64
export type IntValue_u64 = {
type: "u64"
}

export function u64(v: bigint): Value {
return mkInt("u64", v)
}

// i64
export type IntValue_i64 = {
type: "i64"
}

export function i64(v: bigint): Value {
return mkInt("i64", v)
}

// u128
export type IntValue_u128 = {
type: "u128"
}

export function u128(v: bigint): Value {
return mkInt("u128", v)
}

// i128
export type IntValue_i128 = {
type: "i128"
}

export function i128(v: bigint): Value {
return mkInt("i128", v)
}

// true or false
export type BoolValue = {
val: boolean
type: "bool"
}

export function bool(v: boolean): Value {
return { type: "bool", val: v }
}

// Symbols are small efficient strings up to 32 characters in length and limited to a-z A-Z 0-9 _ that are encoded into 64-bit integers.
// We store the string representation, and optionally the number.
// TODO: determine _how_ the strings are encoded as numbers
export type SymbValue = {
val: string
type: "symb"
num?: number
}

export function symb(s: string): Value {
const obj = { type: "symb", val: s } as Value
if (!isValid(obj)) {
throw new TypeError(`Symbols must be up to 32 alphanumeric characters or underscores, found: ${s}.`)
}
return obj
}

// Addresses are always length-56
export type AddrValue = {
val: string
type: "addr"
}

export function addr(s: string): Value {
const obj = { type: "addr", val: s } as Value
if (!isValid(obj)) {
throw new TypeError(`Symbols must be up to 32 alphanumeric characters or underscores, found: ${s}.`)
}
return obj
}

// Byte arrays (Bytes, BytesN)
// The `len` field is present iff the length is fixed (i.e. for BytesN)
// TODO: tests
export type ArrValue = {
val: IntValue_u32[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we already know that we have an unsigned u32 here, why don't we just use number? Most likely, you would have to use the array length in loops, which would make it much easier if we are using number.

type: "arr"
len?: number
// if (typeof (l) !== 'undefined' && v.length !== l) {
// throw new TypeError(`Array declared as fixed-length ${l}, but actual length is ${v.length}.`)
// }
}





82 changes: 82 additions & 0 deletions solarkraft/test/state/value.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import { assert } from 'chai'
import { describe, it } from 'mocha'

import { isValid, u32, i32, u64, i64, u128, i128, symb, addr } from '../../src/state/value.js'

describe('Integer tests', () => {
it('asserts 32-bit integer constructors respect bounds', () => {
assert.throws(() => { u32(-1n) }, RangeError)
assert.throws(() => { u32(2n ** 32n + 1n) }, RangeError)
assert.throws(() => { i32(-(2n ** 31n) - 1n) }, RangeError)
assert.throws(() => { i32(2n ** 31n) }, RangeError)

const x_u32 = u32(2n ** 20n)
assert(isValid(x_u32))
assert(x_u32.type === "u32")
assert(x_u32.val === 2n ** 20n)

const x_i32 = i32(-(2n ** 20n))
assert(isValid(x_i32))
assert(x_i32.type === "i32")
assert(x_i32.val === -(2n ** 20n))
})

it('asserts 64-bit integer constructors respect bounds', () => {
assert.throws(() => { u64(-1n) }, RangeError)
assert.throws(() => { u64(2n ** 64n + 1n) }, RangeError)
assert.throws(() => { i64(-(2n ** 63n) - 1n) }, RangeError)
assert.throws(() => { i64(2n ** 63n) }, RangeError)

const x_u64 = u64(2n ** 40n)
assert(isValid(x_u64))
assert(x_u64.type === "u64")
assert(x_u64.val === 2n ** 40n)

const x_i64 = i64(-(2n ** 40n))
assert(isValid(x_i64))
assert(x_i64.type === "i64")
assert(x_i64.val === -(2n ** 40n))
})

it('asserts 128-bit integer constructors respect bounds', () => {
assert.throws(() => { u128(-1n) }, RangeError)
assert.throws(() => { u128(2n ** 128n + 1n) }, RangeError)
assert.throws(() => { i128(-(2n ** 127n) - 1n) }, RangeError)
assert.throws(() => { i128(2n ** 127n) }, RangeError)

const x_u128 = u128(2n ** 80n)
assert(isValid(x_u128))
assert(x_u128.type === "u128")
assert(x_u128.val === 2n ** 80n)

const x_i128 = i128(-(2n ** 80n))
assert(isValid(x_i128))
assert(x_i128.type === "i128")
assert(x_i128.val === -(2n ** 80n))
})
})

describe('Stringlike tests', () => {
it('asserts SymValue constructors properly check requirements', () => {
assert.throws(() => { symb("waaaaaaaaaaaaaaaaay tooooooooooooooooooooooooo loooooooooooooooooooooooooooooong") }, TypeError)
assert.throws(() => { symb('\u2615') }, TypeError)

const s = symb("FOO")
assert(s.val === 'FOO')
})

it('asserts Address constructors properly check requirements', () => {
assert.throws(() => { addr("LOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONG") }, TypeError)
assert.throws(() => { addr('========================================================') }, TypeError)
assert.throws(() => { addr('FOO') }, TypeError)

const s = addr("ALICE000000000000000000000000000000000000000000000000000")
assert(s.val === "ALICE000000000000000000000000000000000000000000000000000")
})
})

describe('Array tests', () => {
it('asserts something about arrays (TODO)', () => {
// todo
})
})