Browse Source

Update dependencies

develop
Silvestr Predko 2 years ago
parent
commit
067d4d6f24
3 changed files with 28 additions and 33 deletions
  1. 1
    1
      common-api/Cargo.toml
  2. 2
    2
      web-client/Cargo.toml
  3. 25
    30
      web-client/tests/integration.rs

+ 1
- 1
common-api/Cargo.toml View File

10
 """
10
 """
11
 
11
 
12
 [dependencies]
12
 [dependencies]
13
-borsh = "0.9"
13
+borsh = "0.10"
14
 near-client = { git = "https://github.com/Relayz-io/near-client.git" }
14
 near-client = { git = "https://github.com/Relayz-io/near-client.git" }
15
 serde = { version = "1", default-features = false, features = ["derive"] }
15
 serde = { version = "1", default-features = false, features = ["derive"] }
16
 
16
 

+ 2
- 2
web-client/Cargo.toml View File

15
 base64 = "0.21"
15
 base64 = "0.21"
16
 console_error_panic_hook = "0.1"
16
 console_error_panic_hook = "0.1"
17
 common-api = { path = "../common-api" }
17
 common-api = { path = "../common-api" }
18
-console_log = { version = "0.2", features = ["color"] }
18
+console_log = { version = "1", features = ["color"] }
19
 futures = "0.3"
19
 futures = "0.3"
20
 gloo-timers = { version = "0.2", features = ["futures-core", "futures"] }
20
 gloo-timers = { version = "0.2", features = ["futures-core", "futures"] }
21
 itertools = "0.10"
21
 itertools = "0.10"
28
 serde-wasm-bindgen = "0.5"
28
 serde-wasm-bindgen = "0.5"
29
 serde = { version = "1", default-features = false, features = ["derive"] }
29
 serde = { version = "1", default-features = false, features = ["derive"] }
30
 serde_json = { version = "1", default-features = false }
30
 serde_json = { version = "1", default-features = false }
31
-uuid = { version = "1.1.2", features = ["v4", "serde", "js"] }
31
+uuid = { version = "1.3", features = ["v4", "serde", "js"] }
32
 url = "2.2"
32
 url = "2.2"
33
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
33
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
34
 wasm-bindgen-futures = "0.4"
34
 wasm-bindgen-futures = "0.4"

+ 25
- 30
web-client/tests/integration.rs View File

1
-use near_client::{near_units, prelude::*};
1
+use near_client::{near_primitives_light::views::AccessKeyView, near_units, prelude::*};
2
 use serde::{Deserialize, Serialize};
2
 use serde::{Deserialize, Serialize};
3
 use std::str::FromStr;
3
 use std::str::FromStr;
4
 use url::Url;
4
 use url::Url;
40
         .await
40
         .await
41
         .unwrap();
41
         .unwrap();
42
 
42
 
43
-    let nonce = Result::from(
44
-        client
45
-            .view_access_key(&id, &pk, Finality::None)
46
-            .await
47
-            .unwrap(),
48
-    )
49
-    .unwrap();
43
+    let nonce = client
44
+        .view_access_key(&id, &pk, Finality::None)
45
+        .await
46
+        .unwrap()
47
+        .nonce;
50
 
48
 
51
     Signer::from_secret(sk, id, nonce)
49
     Signer::from_secret(sk, id, nonce)
52
 }
50
 }
61
     let sk = Ed25519SecretKey::try_from_bytes(sk_bytes).unwrap();
59
     let sk = Ed25519SecretKey::try_from_bytes(sk_bytes).unwrap();
62
     let pk = Ed25519PublicKey::from(&sk);
60
     let pk = Ed25519PublicKey::from(&sk);
63
 
61
 
64
-    if let Ok(access_key) = client.view_access_key(&id, &pk, Finality::Final).await {
65
-        if let Ok(nonce) = access_key.into() {
66
-            let signer = Signer::from_secret(sk, id.clone(), nonce);
67
-            signer.update_nonce(nonce);
68
-
69
-            client
70
-                .delete_account(&signer, &id, beneficiary_acc_id)
71
-                .commit(Finality::Final)
72
-                .await
73
-                .unwrap();
74
-        };
62
+    if let Ok(AccessKeyView { nonce, .. }) = client.view_access_key(&id, &pk, Finality::Final).await
63
+    {
64
+        let signer = Signer::from_secret(sk, id.clone(), nonce);
65
+        signer.update_nonce(nonce);
66
+
67
+        client
68
+            .delete_account(&signer, &id, beneficiary_acc_id)
69
+            .commit(Finality::Final)
70
+            .await
71
+            .unwrap();
75
     }
72
     }
76
 }
73
 }
77
 
74
 
85
 }
82
 }
86
 
83
 
87
 async fn validator_account(client: &NearClient, validator_key: ValidatorKey) -> Signer {
84
 async fn validator_account(client: &NearClient, validator_key: ValidatorKey) -> Signer {
88
-    let key_nonce = Result::from(
89
-        client
90
-            .view_access_key(
91
-                &validator_key.account_id,
92
-                &validator_key.public_key,
93
-                Finality::Final,
94
-            )
95
-            .await
96
-            .unwrap(),
97
-    )
98
-    .unwrap();
85
+    let key_nonce = client
86
+        .view_access_key(
87
+            &validator_key.account_id,
88
+            &validator_key.public_key,
89
+            Finality::Final,
90
+        )
91
+        .await
92
+        .unwrap()
93
+        .nonce;
99
 
94
 
100
     Signer::from_secret_str(
95
     Signer::from_secret_str(
101
         &validator_key.secret_key,
96
         &validator_key.secret_key,

Loading…
Cancel
Save