chore: remove fluent api and clean up examples (#254)

deps/polkadot/types.ts

@@ -0,0 +1 @@
+export * from "https://deno.land/x/[email protected]/types/mod.ts";

effect/extrinsic.test.ts

@@ -34,7 +34,7 @@ Deno.test({
       fn: async () => {
         const root = C.readEntry(config, "System", "Account", [t.bob.publicKey]);
 
-        const state = U.throwIfError(await root.run());
+        const state = await root.run();
 
         assertObjectMatch(state, { value: { data: { free: 10000000000012345n } } });
       },

examples/balance.ts

@@ -4,11 +4,7 @@ import * as U from "../util/mod.ts";
 
 const config = await t.config();
 
-const root = C
-  .chain(config)
-  .pallet("System")
-  .entry("Account", t.alice.publicKey)
-  .read();
+const root = C.readEntry(config, "System", "Account", [t.alice.publicKey]);
 
 console.log(U.throwIfError(await root.run()));
 

effect/examples/derived.ts → examples/derived.ts

@@ -1,7 +1,8 @@
-import * as C from "../../mod.ts";
-import * as U from "../../util/mod.ts";
+import * as C from "../mod.ts";
+import * as U from "../util/mod.ts";
 
 const ids = C.readEntry(C.polkadot, "Paras", "Parachains", []);
+
 const root = C.into([ids], ({ value }) => {
   const heads = value.map((id: number) => {
     return C.readEntry(C.polkadot, "Paras", "Heads", [id]);

examples/first_ten_keys.ts

@@ -4,13 +4,8 @@ import * as U from "../util/mod.ts";
 
 const config = await t.config();
 
-const root = C
-  .chain(config)
-  .pallet("System")
-  .entry("Account")
-  .keyPage(10)
-  .read();
+const root = C.readKeyPage(config, "System", "Account", 10);
 
-console.log(U.throwIfError(await root.run()));
+console.log(U.throwIfError(await root.run()).keys);
 
 config.close();

examples/metadata.ts

@@ -4,10 +4,7 @@ import * as U from "../util/mod.ts";
 
 const config = await t.config();
 
-const root = C
-  .chain(config)
-  .metadata()
-  .read();
+const root = C.metadata(config);
 
 console.log(U.throwIfError(await root.run()));
 

examples/polkadot_signer.ts

@@ -1,39 +1,37 @@
-import { TypeRegistry } from "https://deno.land/x/polkadot@0.0.8/types/mod.ts";
+import { TypeRegistry } from "../deps/polkadot/types.ts";
 import * as C from "../mod.ts";
 import * as t from "../test-util/mod.ts";
 import * as U from "../util/mod.ts";
 
-const config = await t.config();
+const config = await t.config({ altRuntime: "westend" });
 
-const root = C
-  .chain(config)
-  .pallet("Balances")
-  .extrinsic("transfer")
-  .call({
+const root = C.sendAndWatchExtrinsic({
+  config,
+  sender: {
+    type: "Id",
+    value: t.alice.publicKey,
+  },
+  palletName: "Balances",
+  methodName: "transfer",
+  args: {
     value: 12345n,
     dest: {
       type: "Id",
       value: t.bob.publicKey,
     },
-  })
-  .signed(
-    {
-      type: "Id",
-      value: t.alice.publicKey,
-    },
-    {
-      signPayload(payload: any) {
-        const tr = new TypeRegistry();
-        tr.setSignedExtensions(payload.signedExtensions);
-        return Promise.resolve(
-          tr
-            .createType("ExtrinsicPayload", payload, { version: payload.version })
-            .sign(t.alice),
-        );
-      },
+  },
+  sign: {
+    signPayload(payload) {
+      const tr = new TypeRegistry();
+      tr.setSignedExtensions(payload.signedExtensions);
+      return Promise.resolve(
+        tr
+          .createType("ExtrinsicPayload", payload, { version: payload.version })
+          .sign(t.alice),
+      );
     },
-  )
-  .sendAndWatch((stop) => {
+  },
+  createWatchHandler(stop) {
     return (event) => {
       if (typeof event.params.result === "string") {
         console.log("Extrinsic", event.params.result);
@@ -45,9 +43,13 @@ const root = C
           stop();
         } else {
           console.log("Misc", event.params.result);
+          stop();
         }
       }
     };
-  });
+  },
+});
 
 U.throwIfError(await root.run());
+
+config.close();

examples/raw_rpc_client/call.ts

@@ -0,0 +1,9 @@
+import * as C from "../../mod.ts";
+import * as rpc from "../../rpc/mod.ts";
+import * as U from "../../util/mod.ts";
+
+const client = U.throwIfError(await rpc.stdClient(C.westend));
+
+console.log(await client.call("state_getMetadata", []));
+
+await client.close();

examples/raw_rpc_client/subscription.ts

@@ -0,0 +1,20 @@
+import * as C from "../../mod.ts";
+import * as rpc from "../../rpc/mod.ts";
+import * as U from "../../util/mod.ts";
+
+const client = U.throwIfError(await rpc.stdClient(C.westend));
+
+const maybeError = await client.subscribe("chain_subscribeAllHeads", [], (stop) => {
+  let i = 1;
+  return async (message) => {
+    console.log({ [i++]: message.params.result });
+    if (i > 5) {
+      stop();
+      await client.close();
+    }
+  };
+});
+
+if (maybeError) {
+  console.log(maybeError);
+}

examples/events.ts → examples/read_block.ts

@@ -1,10 +1,6 @@
 import * as C from "../mod.ts";
 import * as U from "../util/mod.ts";
 
-const root = C
-  .chain(C.polkadot)
-  .pallet("System")
-  .entry("Events")
-  .read();
+const root = C.readBlock(C.polkadot);
 
 console.log(U.throwIfError(await root.run()));

examples/read_events.ts

@@ -0,0 +1,6 @@
+import * as C from "../mod.ts";
+import * as U from "../util/mod.ts";
+
+const root = C.readEntry(C.westend, "System", "Events", []);
+
+console.log(U.throwIfError(await root.run()));

examples/rpc_call.ts

@@ -0,0 +1,6 @@
+import * as C from "../mod.ts";
+import * as U from "../util/mod.ts";
+
+const root = C.rpcCall(C.polkadot, "rpc_methods", []);
+
+console.log(U.throwIfError(await root.run()));

effect/examples/subscription.ts → examples/rpc_subscription.ts

@@ -1,12 +1,11 @@
-import * as C from "../../mod.ts";
-import * as t from "../../test-util/mod.ts";
-import * as U from "../../util/mod.ts";
+import * as C from "../mod.ts";
+import * as t from "../test-util/mod.ts";
+import * as U from "../util/mod.ts";
 
 const config = await t.config();
 
 const root = C.rpcSubscription(config, "chain_subscribeNewHead", [], (stop) => {
   let i = 0;
-
   return (m) => {
     i++;
     if (i > 5) {

examples/those_of_subxt/read_bonded.ts

@@ -5,6 +5,7 @@ import * as U from "../../util/mod.ts";
 const config = await t.config();
 
 const aliceStash = t.alice.derive("//stash");
+
 const aliceBonded = C.readEntry(config, "Staking", "Bonded", [aliceStash.publicKey]);
 
 console.log(U.throwIfError(await aliceBonded.run()));

examples/those_of_subxt/read_era_rewards.ts

@@ -1,10 +1,10 @@
 import * as C from "../../mod.ts";
 import * as U from "../../util/mod.ts";
 
-const idx = C
-  .readEntry(C.polkadot, "Staking", "ActiveEra", [])
+const idx = C.readEntry(C.polkadot, "Staking", "ActiveEra", [])
   .select("value")
   .select("index");
+
 const eraRewardPoints = C.readEntry(C.polkadot, "Staking", "ErasRewardPoints", [idx]);
 
 console.log(U.throwIfError(await eraRewardPoints.run()));