fix: watch blocks (#246)

paritytech · Sep 27, 2022 · acbb3ec · acbb3ec
1 parent 406ca84
commit acbb3ec
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/_tasks/dnt.ts b/_tasks/dnt.ts
@@ -23,9 +23,9 @@ await Promise.all([
     }],
     outDir,
     mappings: {
-      "https://deno.land/x/[email protected].0/mod.ts": {
+      "https://deno.land/x/[email protected].3/mod.ts": {
         name: "parity-scale-codec",
-        version: "^0.5.0",
+        version: "^0.5.3",
       },
       "deps/smoldot_phantom.ts": {
         name: "@substrate/smoldot-light",

diff --git a/deps/scale.ts b/deps/scale.ts
@@ -1 +1 @@
-export * from "https://deno.land/x/[email protected].0/mod.ts";
+export * from "https://deno.land/x/[email protected].3/mod.ts";
diff --git a/effect/std/watchBlocks.ts b/effect/std/watchBlocks.ts
@@ -24,7 +24,7 @@ export function watchBlocks(
       const block = await readBlock(config, blockHash as unknown as U.HashHexString).run(); // STOP THIS MADNESS
       if (block instanceof Error) {
         // TODO: subscription runtime error channel
-        throw new Error();
+        throw block;
       }
       watchHandler(block.block);
     };

diff --git a/examples/watch_blocks.ts b/examples/watch_blocks.ts
@@ -0,0 +1,14 @@
+import * as C from "../mod.ts";
+
+console.log(
+  await C.watchBlocks(C.westend, (stop) => {
+    let i = 0;
+    return ({ block }) => {
+      console.log(block.header);
+      if (i === 2) {
+        stop();
+      }
+      i++;
+    };
+  }).run(),
+);
diff --git a/frame_metadata/Codec.ts b/frame_metadata/Codec.ts
@@ -24,7 +24,7 @@ export function DeriveCodec(tys: M.Ty[]): DeriveCodec {
       return $.tuple(...members.map((x) => this.visit(x)));
     },
     objectStruct(ty) {
-      return $.object(...ty.fields.map((x): $.Field => [x.name!, this.visit(x.ty)]));
+      return $.object(...ty.fields.map((x): $.AnyField => [x.name!, this.visit(x.ty)]));
     },
     option(_ty, some) {
       return $.option(this.visit(some));
@@ -43,9 +43,9 @@ export function DeriveCodec(tys: M.Ty[]): DeriveCodec {
       return $.stringUnion(members);
     },
     taggedUnion(ty) {
-      const members: Record<number, $.TaggedUnionMember> = {};
+      const members: Record<number, $.AnyTaggedUnionMember> = {};
       for (const { fields, name: type, index } of ty.members) {
-        let member: $.TaggedUnionMember;
+        let member: $.AnyTaggedUnionMember;
         if (fields.length === 0) {
           member = [type];
         } else if (fields[0]!.name === undefined) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from "https://deno.land/x/[email protected].0/mod.ts";
		export * from "https://deno.land/x/[email protected].3/mod.ts";