Fix: Merge conflict

Co-authored-by: Drew Ansbacher <drew.ansbacher@gmail.com>
This commit is contained in:
J M
2021-12-21 15:33:34 -07:00
committed by Aiden McClelland
parent e2a51475a7
commit 8422315b33

View File

@@ -1,17 +1,13 @@
import { Observable } from 'rxjs' import { Observable } from "rxjs";
import { map } from 'rxjs/operators' import { map } from "rxjs/operators";
import { Update } from '../types' import { Update } from "../types";
import { Source } from './source' import { Source } from "./source";
import { RPCResponse } from './ws-source' import { RPCResponse } from "./ws-source";
export class MockSource<T> implements Source<T> { export class MockSource<T> implements Source<T> {
constructor(private readonly seed: Observable<Update<T>>) {}
constructor ( watch$(): Observable<RPCResponse<Update<T>>> {
private readonly seed: Observable<Update<T>>, return this.seed.pipe(map((result) => ({ result, jsonrpc: "2.0" })));
) { } }
watch$ (): Observable<RPCResponse<Update<T>>> {
return this.seed.pipe(map(result => ({ result,
jsonrpc: '2.0' })))
}
} }