Skip to content

Commit

Permalink
🛠️ Fix Unit Tests and Add KvMap and Keys Functionality (#235)
Browse files Browse the repository at this point in the history 
* 🔧 Fix KV Delete Bug

* 🔨 Build KvMap

* 🔨 Add Keys and KvMap Functions

* 🔧 Fix Unit Tests

* 🔧 Fix Linting Issues in UnitTest

* chore: Set to boolean

---------

Co-authored-by: andreespirela <andreespirela@outlook.com>
  • Loading branch information
@Roaring30s @andreespirela
Roaring30s and andreespirela authored Oct 19, 2023
1 parent 080bba8 commit 09a2ea9
Show file tree
Hide file tree
Showing 8 changed files with 3,820 additions and 19 deletions.
56 changes: 54 additions & 2 deletions crates/exm/base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,21 @@
window.BaseReqResponse = BaseReqResponse;

class Base {
// key is the table name
kv = {};

requests = {};

instantiated = false;

constructor() {
}

init() {
if(!this.instantiated) {
this.instantiated = true;
}
}

getDate() {
return new Date(Number(Deno.core.opSync("op_get_executor_settings", "TX_DATE") || "1317830400000"));
}
Expand All @@ -140,6 +147,36 @@
Deno.core.opSync("op_exm_write_to_console", toPrint);
}

filterKv(gte, lt, reverse, limit) {

const arr1 = Object.entries(this.kv);

if (lt > arr1.length || gte < 0 || gte >= lt) {
throw new Error("invalid range");
}

if(limit > lt && limit > Object.keys(this.kv).length) {
throw new Error("limit is bigger than lt");
}

if(isNaN(parseInt(limit))) {
throw new Error("limit must be a numeric value");
}

let arr2 = arr1.slice(gte, lt);
if(reverse) {
arr2 = arr2.reverse();
}

if(limit !== undefined) {
arr2 = arr2.slice(0, limit);
}

const obj = Object.fromEntries(arr2);

return obj;
}

putKv(key, value) {
this.kv[key] = value;
}
Expand All @@ -152,6 +189,17 @@
delete this.kv[key];
}

getKvMap(gte = 0, lt = Object.keys(this.kv).length, reverse = false, limit) {
const result = this.filterKv(gte, lt, reverse, limit);
return result;
}

getKeys(gte = 0, lt = Object.keys(this.kv).length, reverse = false, limit) {
const result = this.filterKv(gte, lt, reverse, limit);
const keysArray = Object.keys(result);
return keysArray;
}

async deterministicFetch(...args) {
const jsonArgs = JSON.stringify(args);
const reqHash = await this.sha256(new TextEncoder().encode(jsonArgs));
Expand Down Expand Up @@ -207,16 +255,20 @@
get: () => {
const isEXM = Deno.core.opSync("op_get_executor_settings", "EXM");
const preKv = (globalThis?.exmContext?.kv || {});
if(Object.values(preKv).length > 0) {
// Inject KV for persistence
if(Object.values(preKv).length > 0 && !baseIns.instantiated) {
Object.entries(preKv).forEach(([key, val]) => {
baseIns.putKv(key, val);
});
baseIns.init();
}

if (!window[ExmSymbol]) {
Object.defineProperty(window, ExmSymbol, {
value: isEXM ? baseIns : {
requests: {},
kv: {},
instantiated: true,
},
configurable: false,
writable: false,
Expand Down
4 changes: 1 addition & 3 deletions crates/js/lib.rs
View file

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion crates/smartweave/smartweave.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,16 @@
return globalThis.EXM.getKv(key);
},
del(key) {
globalThis.EXM.delKv(key);
globalThis.EXM.delKv(key)
},
getAll() {
return globalThis.EXM.kv;
},
kvMap(gte, lt, reverse, limit) {
return globalThis.EXM.getKvMap(gte, lt, reverse, limit);
},
keys(gte, lt, reverse, limit) {
return globalThis.EXM.getKeys(gte, lt, reverse, limit);
}
};
}
Expand Down
104 changes: 96 additions & 8 deletions js/napi/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ mod tests {
get_cache();
}


// #[tokio::test]
// pub async fn test_execute_contract() {
// let contract = execute_contract(
Expand All @@ -350,7 +351,7 @@ mod tests {
// "VERTO"
// );
// }

#[tokio::test]
pub async fn simulate_contract_test() {
let execution_context: SimulateExecutionContext =
Expand Down Expand Up @@ -516,7 +517,7 @@ mod tests {
assert_eq!(contract.result.as_str().unwrap(), "Hello World");
assert_eq!(contract.updated, true);
}

//NOTE: Fix assert statements within _validateMintingFeeTest in ans.js
#[tokio::test]
pub async fn simulate_contract_ans() {
let contract_source_bytes =
Expand Down Expand Up @@ -552,9 +553,11 @@ mod tests {

let contract_result = contract.state;
let str_state = contract_result.to_string();
//println!("{}", contract_result);
assert!(str_state.contains("wearemintingyes"));
}

}

#[tokio::test]
pub async fn simulate_contract_ark() {
let contract_source_bytes =
Expand Down Expand Up @@ -596,7 +599,7 @@ mod tests {
let contract_result = contract.state;
let str_state = contract_result.to_string();
}

#[tokio::test]
pub async fn simulate_deterministic_fetch_lazy() {
let mut sets: HashMap<String, serde_json::Value> = HashMap::new();
Expand Down Expand Up @@ -631,9 +634,10 @@ mod tests {
};

let contract = simulate_contract(execution_context).await.unwrap();
println!("{}", contract.state);
//println!("{}", contract.state);
}



#[tokio::test]
pub async fn simulate_kv() {
let contract_source_bytes =
Expand Down Expand Up @@ -669,7 +673,91 @@ mod tests {
};

let contract = simulate_contract(execution_context).await.unwrap();
println!("{}", contract.exm_context);
assert_eq!(contract.exm_context.to_string(), r#"{"requests":{},"kv":{"Name":"Andres","Pre-key":"prevalue"}}"#);
//println!("{}", contract.exm_context);
assert_eq!(contract.exm_context.to_string().contains("Name"), true);
}


#[tokio::test]
pub async fn simulate_kv_del() {
let contract_source_bytes =
include_bytes!("../../../testdata/contracts/delKv.js");
let contract_source_vec = contract_source_bytes.to_vec();
let execution_context: SimulateExecutionContext =
SimulateExecutionContext {
contract_id: String::new(),
interactions: vec![SimulateInput {
id: String::from("abcd"),
owner: String::from("210392sdaspd-asdm-asd_sa0d1293-lc"),
quantity: String::from("12301"),
reward: String::from("12931293"),
target: None,
tags: vec![],
block: None,
input: serde_json::json!({
"key": "Name",
"value": ""
})
.to_string(),
}],
contract_init_state: Some(r#"{"users": []}"#.into()),
maybe_config: None,
maybe_cache: Some(false),
maybe_bundled_contract: None,
maybe_settings: None,
maybe_exm_context: Some(r#"{"requests": {}, "kv": {"Nile": "River", "Name": "Mickey", "Amazon": "River"}, "initiated":[]}"#.into()),
maybe_contract_source: Some(ContractSource {
contract_src: contract_source_vec.into(),
contract_type: SimulateContractType::JAVASCRIPT,
}),
};

let contract = simulate_contract(execution_context).await.unwrap();
//println!("{}", contract.exm_context);
assert_eq!(contract.exm_context.to_string().contains("Name"), false);
}

#[tokio::test]
pub async fn simulate_kv_map() {
let contract_source_bytes =
include_bytes!("../../../testdata/contracts/kvMap.js");
let contract_source_vec = contract_source_bytes.to_vec();
let execution_context: SimulateExecutionContext =
SimulateExecutionContext {
contract_id: String::new(),
interactions: vec![SimulateInput {
id: String::from("abcd"),
owner: String::from("210392sdaspd-asdm-asd_sa0d1293-lc"),
quantity: String::from("12301"),
reward: String::from("12931293"),
target: None,
tags: vec![],
block: None,
input: serde_json::json!({
"gte": "1",
"lt": "4",
"reverse": false,
"limit": "2"
})
.to_string(),
}],
contract_init_state: Some(r#"{"users": []}"#.into()),
maybe_config: None,
maybe_cache: Some(false),
maybe_bundled_contract: None,
maybe_settings: None,
maybe_exm_context: Some(r#"{"requests": {}, "kv": {"Nile": "River1", "Yangtze": "River2", "Amazon": "River3", "Mississippi": "River4", "Name": "Buccees"}, "initiated":[]}"#.into()),
maybe_contract_source: Some(ContractSource {
contract_src: contract_source_vec.into(),
contract_type: SimulateContractType::JAVASCRIPT,
}),
};

let contract = simulate_contract(execution_context).await.unwrap();
//println!("{}", contract.exm_context);
//println!("{}", contract.result);
assert_eq!(contract.result, "[\"Yangtze\",\"Amazon\"]");
}

}

Loading

0 comments on commit 09a2ea9

Please sign in to comment.