fix: subscription api name

vitelabs · Feb 28, 2022 · f11d410 · f11d410
1 parent 9d72d77
commit f11d410
Show file tree

Hide file tree

Showing 16 changed files with 142 additions and 142 deletions.
diff --git a/docs/viteAPI/readme.md b/docs/viteAPI/readme.md
@@ -251,7 +251,7 @@ Refer to [Vite RPC Subscription](/api/rpc/subscribe_v2)
 ```javascript
 // ...
 
-provider.subscribe('subscribe_createAccountBlockSubscription').then((event) => {
+provider.subscribe('newAccountBlock').then((event) => {
     event.on((result) => {
         console.log(result);
     });

diff --git a/src/HTTP/type.ts b/src/HTTP/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/IPC/type.ts b/src/IPC/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/WS/type.ts b/src/WS/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/abi/type.ts b/src/abi/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/accountBlock/type.ts b/src/accountBlock/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/communication/type.ts b/src/communication/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/constant/type.ts b/src/constant/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/error/type.ts b/src/error/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/keystore/type.ts b/src/keystore/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/type.ts b/src/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/utils/type.ts b/src/utils/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/viteAPI/provider.ts b/src/viteAPI/provider.ts
@@ -82,7 +82,7 @@ class ProviderClass {
     }
 
     async subscribe(methodName, ...args) {
-        const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : methodName;
+        const subMethodName = this._provider.subscribe ? 'subscribe_subscribe' : `subscribe_${ methodName }Filter`;
         const params = this._provider.subscribe ? [ methodName, ...args ] : args;
 
         let rep;

diff --git a/src/viteAPI/type.ts b/src/viteAPI/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;

diff --git a/src/vitejs/type.ts b/src/vitejs/type.ts
@@ -220,18 +220,18 @@ export declare type Methods = string |
 'net_nodeInfo' |
 'net_peers' |
 'util_getPoWNonce' |
-'subscribe_createSnapshotBlockFilter' |
-'subscribe_createAccountBlockFilter' |
-'subscribe_createAccountBlockFilterByAddress' |
-'subscribe_createUnreceivedBlockFilterByAddress' |
-'subscribe_createVmlogFilter' |
+'subscribe_newSnapshotBlockFilter' |
+'subscribe_newAccountBlockFilter' |
+'subscribe_newAccountBlockByAddressFilter' |
+'subscribe_newUnreceivedBlockByAddressFilter' |
+'subscribe_newVmLogFilter' |
 'subscribe_uninstallFilter' |
 'subscribe_getChangesByFilterId' |
-'subscribe_createSnapshotBlockSubscription' |
-'subscribe_createAccountBlockSubscription' |
-'subscribe_createAccountBlockSubscriptionByAddress' |
-'subscribe_createUnreceivedBlockSubscriptionByAddress' |
-'subscribe_createVmlogSubscription';
+'subscribe_newSnapshotBlock' |
+'subscribe_newAccountBlock' |
+'subscribe_newAccountBlockByAddress' |
+'subscribe_newUnreceivedBlockByAddress' |
+'subscribe_newVmLog';
 
 export declare interface RPCRequest {
     type?: string;