Updating to match 1.0.0 spec

wharfkit · Jul 31, 2023 · 1139a9c · 1139a9c
1 parent 24b1af9
commit 1139a9c
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 439 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ lib: ${SRC_FILES} package.json tsconfig.json node_modules rollup.config.js
 
 .PHONY: test
 test: node_modules
-	@TS_NODE_PROJECT='./test/tsconfig.json' \
+	@TS_NODE_PROJECT='./test/tsconfig.json' MOCK_DIR='./test/data' \
 		${BIN}/mocha ${MOCHA_OPTS} ${TEST_FILES} --grep '$(grep)'
 
 build/coverage: ${SRC_FILES} ${TEST_FILES} node_modules
@@ -24,7 +24,7 @@ coverage: build/coverage
 
 .PHONY: ci-test
 ci-test: node_modules
-	@TS_NODE_PROJECT='./test/tsconfig.json' \
+	@TS_NODE_PROJECT='./test/tsconfig.json' MOCK_DIR='./test/data' \
 		${BIN}/nyc ${NYC_OPTS} --reporter=text \
 		${BIN}/mocha ${MOCHA_OPTS} -R list ${TEST_FILES}
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@wharfkit/wallet-plugin-template",
     "description": "A template to create wallet plugins for use with @wharfkit/session.",
-    "version": "0.3.0",
+    "version": "1.0.0",
     "homepage": "https://github.com/wharfkit/wallet-plugin-template",
     "license": "BSD-3-Clause",
     "main": "lib/wallet-plugin-template.js",
@@ -19,7 +19,7 @@
         "tslib": "^2.1.0"
     },
     "peerDependencies": {
-        "@wharfkit/session": "^0.3.0"
+        "@wharfkit/session": "^1.0.0"
     },
     "devDependencies": {
         "@rollup/plugin-alias": "^3.1.4",
@@ -34,7 +34,8 @@
         "@types/node": "^18.7.18",
         "@typescript-eslint/eslint-plugin": "^5.20.0",
         "@typescript-eslint/parser": "^5.20.0",
-        "@wharfkit/session": "^0.4.0",
+        "@wharfkit/mock-data": "^1.0.2",
+        "@wharfkit/session": "^1.0.0",
         "chai": "^4.3.4",
         "eslint": "^8.13.0",
         "eslint-config-prettier": "^8.1.0",

diff --git a/src/index.ts b/src/index.ts
@@ -59,7 +59,7 @@ export class WalletPluginTEMPLATE extends AbstractWalletPlugin implements Wallet
             chain: Checksum256.from(
                 '73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d'
             ),
-            permissionLevel: PermissionLevel.from('wharfkit1115@test'),
+            permissionLevel: PermissionLevel.from('wharfkit1111@test'),
         }
     }
     /**

diff --git a/test/data/3de7f859450540bb5aa2948cf30b14815e73623e.json b/test/data/3de7f859450540bb5aa2948cf30b14815e73623e.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "path": "https://jungle4.greymass.com/v1/chain/get_raw_abi",
+        "params": {
+            "method": "POST",
+            "body": "{\"account_name\":\"eosio.token\"}"
+        }
+    },
+    "status": 200,
+    "json": {
+        "account_name": "eosio.token",
+        "code_hash": "33109b3dd5d354cab5a425c1d4c404c4db056717215f1a8b7ba036a6692811df",
+        "abi_hash": "d84356074da34a976528321472d73ac919227b9b01d9de59d8ade6d96440455c",
+        "abi": "DmVvc2lvOjphYmkvMS4yAAgHYWNjb3VudAABB2JhbGFuY2UFYXNzZXQFY2xvc2UAAgVvd25lcgRuYW1lBnN5bWJvbAZzeW1ib2wGY3JlYXRlAAIGaXNzdWVyBG5hbWUObWF4aW11bV9zdXBwbHkFYXNzZXQOY3VycmVuY3lfc3RhdHMAAwZzdXBwbHkFYXNzZXQKbWF4X3N1cHBseQVhc3NldAZpc3N1ZXIEbmFtZQVpc3N1ZQADAnRvBG5hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcEb3BlbgADBW93bmVyBG5hbWUGc3ltYm9sBnN5bWJvbAlyYW1fcGF5ZXIEbmFtZQZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwh0cmFuc2ZlcgAEBGZyb20EbmFtZQJ0bwRuYW1lCHF1YW50aXR5BWFzc2V0BG1lbW8Gc3RyaW5nBgAAAAAAhWlEBWNsb3NlAAAAAACobNRFBmNyZWF0ZQAAAAAAAKUxdgVpc3N1ZQAAAAAAADBVpQRvcGVuAAAAAACo67K6BnJldGlyZQAAAABXLTzNzQh0cmFuc2ZlcgACAAAAOE9NETIDaTY0AAAHYWNjb3VudAAAAAAAkE3GA2k2NAAADmN1cnJlbmN5X3N0YXRzAAAAAA==="
+    },
+    "text": "{\"account_name\":\"eosio.token\",\"code_hash\":\"33109b3dd5d354cab5a425c1d4c404c4db056717215f1a8b7ba036a6692811df\",\"abi_hash\":\"d84356074da34a976528321472d73ac919227b9b01d9de59d8ade6d96440455c\",\"abi\":\"DmVvc2lvOjphYmkvMS4yAAgHYWNjb3VudAABB2JhbGFuY2UFYXNzZXQFY2xvc2UAAgVvd25lcgRuYW1lBnN5bWJvbAZzeW1ib2wGY3JlYXRlAAIGaXNzdWVyBG5hbWUObWF4aW11bV9zdXBwbHkFYXNzZXQOY3VycmVuY3lfc3RhdHMAAwZzdXBwbHkFYXNzZXQKbWF4X3N1cHBseQVhc3NldAZpc3N1ZXIEbmFtZQVpc3N1ZQADAnRvBG5hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcEb3BlbgADBW93bmVyBG5hbWUGc3ltYm9sBnN5bWJvbAlyYW1fcGF5ZXIEbmFtZQZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwh0cmFuc2ZlcgAEBGZyb20EbmFtZQJ0bwRuYW1lCHF1YW50aXR5BWFzc2V0BG1lbW8Gc3RyaW5nBgAAAAAAhWlEBWNsb3NlAAAAAACobNRFBmNyZWF0ZQAAAAAAAKUxdgVpc3N1ZQAAAAAAADBVpQRvcGVuAAAAAACo67K6BnJldGlyZQAAAABXLTzNzQh0cmFuc2ZlcgACAAAAOE9NETIDaTY0AAAHYWNjb3VudAAAAAAAkE3GA2k2NAAADmN1cnJlbmN5X3N0YXRzAAAAAA===\"}"
+}
diff --git a/test/data/c149c3f64db6e6d5f51fa4b5a3ee31868f05c2a4.json b/test/data/c149c3f64db6e6d5f51fa4b5a3ee31868f05c2a4.json
diff --git a/test/tests/common.ts b/test/tests/common.ts
@@ -1,45 +1,40 @@
 import {assert} from 'chai'
 import {PermissionLevel, SessionKit} from '@wharfkit/session'
+import {
+    mockChainDefinition,
+    mockPermissionLevel,
+    mockSessionKitArgs,
+    mockSessionKitOptions,
+} from '@wharfkit/mock-data'
 
 import {WalletPluginTEMPLATE} from '$lib'
-import {mockFetch} from '$test/utils/mock-fetch'
-import {MockStorage} from '$test/utils/mock-storage'
-import {MockUserInterface} from '$test/utils/mock-ui'
-
-const mockChainDefinition = {
-    id: '73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d',
-    url: 'https://jungle4.greymass.com',
-}
-
-const mockPermissionLevel = PermissionLevel.from('wharfkit1115@test')
-
-const mockSessionKitOptions = {
-    appName: 'unittests',
-    chains: [mockChainDefinition],
-    fetch: mockFetch, // Required for unit tests
-    storage: new MockStorage(),
-    ui: new MockUserInterface(),
-    walletPlugins: [new WalletPluginTEMPLATE()],
-}
 
 suite('wallet plugin', function () {
     test('login and sign', async function () {
-        const kit = new SessionKit(mockSessionKitOptions)
+        const kit = new SessionKit(
+            {
+                ...mockSessionKitArgs,
+                walletPlugins: [new WalletPluginTEMPLATE()],
+            },
+            mockSessionKitOptions
+        )
         const {session} = await kit.login({
             chain: mockChainDefinition.id,
             permissionLevel: mockPermissionLevel,
         })
         assert.isTrue(session.chain.equals(mockChainDefinition))
-        assert.isTrue(session.actor.equals(mockPermissionLevel.actor))
-        assert.isTrue(session.permission.equals(mockPermissionLevel.permission))
+        assert.isTrue(session.actor.equals(PermissionLevel.from(mockPermissionLevel).actor))
+        assert.isTrue(
+            session.permission.equals(PermissionLevel.from(mockPermissionLevel).permission)
+        )
         const result = await session.transact(
             {
                 action: {
-                    authorization: [mockPermissionLevel],
+                    authorization: [PermissionLevel.from(mockPermissionLevel)],
                     account: 'eosio.token',
                     name: 'transfer',
                     data: {
-                        from: mockPermissionLevel.actor,
+                        from: PermissionLevel.from(mockPermissionLevel).actor,
                         to: 'wharfkittest',
                         quantity: '0.0001 EOS',
                         memo: 'wharfkit/session wallet plugin template',