compile and deploy contract in workspaces

petersalomonsen · Dec 24, 2023 · ffe16fa · ffe16fa
1 parent 018ec17
commit ffe16fa
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,12 +1,15 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/universal",
-    "features": {
-        "ghcr.io/devcontainers/features/rust:1": {},
-        "ghcr.io/devcontainers/features/node:1": {}
-    },
-    "customizations": {
-        "vscode": {
-          "extensions": ["rust-lang.rust-analyzer"]
-        }
-      },
+  "image": "mcr.microsoft.com/devcontainers/universal",
+  "features": {
+    "ghcr.io/devcontainers/features/rust:1": {},
+    "ghcr.io/devcontainers/features/node:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rust-lang.rust-analyzer"
+      ]
+    }
+  },
+  "postCreateCommand": ".devcontainer/post-create.sh"
 }
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+rustup target add wasm32-unknown-unknown
diff --git a/nearcontract/Cargo.lock b/nearcontract/Cargo.lock
diff --git a/nearcontract/Cargo.toml b/nearcontract/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2018"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-wee_alloc = "0.4.5"
 byteorder= "1.4.2"
 near-sdk = "4.1.1"
 ed25519-dalek = "1.0.1"

diff --git a/nearcontract/src/lib.rs b/nearcontract/src/lib.rs
@@ -4,12 +4,9 @@ use ed25519_dalek::Signature as DalekSig;
 use near_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use near_sdk::collections::LookupMap;
 use near_sdk::PublicKey;
-use near_sdk::{base64, env, near_bindgen};
+use near_sdk::{base64, env, near_bindgen,PanicOnDefault};
 use std::collections::HashMap;
 
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-
 pub type Permission = u32;
 const PERMISSION_OWNER: Permission = 0x01; // Can create
 const PERMISSION_CONTRIBUTOR: Permission = 0x02;
@@ -41,7 +38,7 @@ pub struct RepositoryPermission {
 }
 
 #[near_bindgen]
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(PanicOnDefault,BorshDeserialize, BorshSerialize)]
 pub struct RepositoryPermissionV2 {
     permission: LookupMap<String, HashMap<String, Permission>>,
 }

diff --git a/nearcontract/tests/test_env.rs b/nearcontract/tests/test_env.rs
@@ -11,12 +11,9 @@ pub async fn init_contracts() -> anyhow::Result<near_workspaces::Contract> {
     let contract_id: AccountId = WASMGIT_CONTRACT.parse()?;
     let contract = worker
         .import_contract(&contract_id, &mainnet)
-        .initial_balance(NearToken::from_near(parse_near!("1000 N")))
+        .initial_balance(NearToken::from_near(1000))
         .transact()
         .await?;
-    let outcome = contract.call("new").args_json(json!({})).transact().await?;
-    assert!(outcome.is_success());
-    assert!(format!("{:?}", outcome).contains("Migrated to version:"));
 
     Ok(contract)
 }