Options then args

packages/light.js/src/rpc/eth.ts

@@ -26,7 +26,7 @@ export function accounts$(options?: RpcObservableOptions) {
   return createRpc$<Address[], Address[]>({
     frequency: [frequency.onAccountsChanged$],
     name: 'accounts$'
-  })()(options);
+  })(options)();
 }
 
 /**
@@ -42,7 +42,7 @@ export function balanceOf$(address: Address, options?: RpcObservableOptions) {
     frequency: [frequency.onEveryBlock$, frequency.onStartup$],
     name: 'balanceOf$',
     pipes: api => [switchMapPromise(() => api.eth.getBalance(address))]
-  })(address)(options);
+  })(options)(address);
 }
 
 /**
@@ -57,7 +57,7 @@ export function defaultAccount$(options?: RpcObservableOptions) {
     dependsOn: accounts$,
     name: 'defaultAccount$',
     pipes: () => [map(accounts => accounts[0])]
-  })()(options);
+  })(options)();
 }
 
 /**
@@ -69,7 +69,7 @@ export function blockNumber$(options?: RpcObservableOptions) {
   return createRpc$<BigNumber, BigNumber>({
     frequency: [frequency.onEveryBlock$],
     name: 'blockNumber$'
-  })()(options);
+  })(options)();
 }
 
 /**
@@ -88,7 +88,7 @@ export function myBalance$(options?: RpcObservableOptions) {
             : balanceOf$(defaultAccount)
       )
     ]
-  })()(options);
+  })(options)();
 }
 
 /**
@@ -100,5 +100,5 @@ export function syncStatus$(options?: RpcObservableOptions) {
   return createRpc$<object | boolean, object | boolean>({
     frequency: [frequency.onSyncingChanged$],
     name: 'syncStatus$'
-  })()(options);
+  })(options)();
 }

packages/light.js/src/rpc/net.ts

@@ -24,5 +24,5 @@ export function peerCount$(options?: RpcObservableOptions) {
     frequency: [frequency.onEvery5Seconds$],
     name: 'peerCount$',
     pipes: api => [switchMapPromise(() => api.net.peerCount())]
-  })()(options);
+  })(options)();
 }

packages/light.js/src/rpc/parity.ts

@@ -33,5 +33,5 @@ export function chainName$(options?: RpcObservableOptions) {
     frequency: [frequency.onStartup$],
     name: 'chainName$',
     pipes: api => [switchMapPromise(() => api.parity.netChain())]
-  })()(options);
+  })(options)();
 }

packages/light.js/src/rpc/utils/createRpc.ts

@@ -69,8 +69,8 @@ const createRpcWithApi = memoizee(
  * createRpc(metadata)(options)(someArgs) returns an Observable.
  */
 const createRpc = <Source, Out>(metadata: Metadata<Source, Out>) => (
-  ...args: any[]
-) => (options: RpcObservableOptions = {}) => {
+  options: RpcObservableOptions = {}
+) => (...args: any[]) => {
   const { provider } = options;
   const api = provider ? createApiFromProvider(provider) : getApi();