From 9b64b122c4c41f5b47446c30763cb88c40931a40 Mon Sep 17 00:00:00 2001 From: Pileks Date: Wed, 12 Apr 2023 19:47:27 +0200 Subject: [PATCH 1/2] import newer logger in typescript template --- .../templates/app/typescript/schema.graphql | 2 +- .../templates/app/typescript/src/index.ts | 53 +++++++++++++------ 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/packages/templates/app/typescript/schema.graphql b/packages/templates/app/typescript/schema.graphql index b6fc4770f6..95d5ea5cee 100644 --- a/packages/templates/app/typescript/schema.graphql +++ b/packages/templates/app/typescript/schema.graphql @@ -1,2 +1,2 @@ -#import * into HelloWorld from "ens/helloworld.polytest.eth" +#import * into Logger from "ens/wraps.eth:logger@1.0.0" #import * into Ethereum from "ens/wraps.eth:ethereum@1.0.0" diff --git a/packages/templates/app/typescript/src/index.ts b/packages/templates/app/typescript/src/index.ts index 021d465362..5ed2345ab7 100644 --- a/packages/templates/app/typescript/src/index.ts +++ b/packages/templates/app/typescript/src/index.ts @@ -1,4 +1,8 @@ -import { HelloWorld_Module, Ethereum_Module } from "./wrap"; +import { + Logger_Module, + Ethereum_Module, + Logger_Logger_LogLevelEnum, +} from "./wrap"; import { PolywrapClient } from "@polywrap/client-js"; @@ -7,22 +11,37 @@ const client = new PolywrapClient(); async function main() { console.log("Invoking: logMessage"); - await HelloWorld_Module.logMessage({ - message: "Hello there" - }, client); - - await HelloWorld_Module.logMessage({ - message: "Hello again" - }, client); - - await HelloWorld_Module.logMessage({ - message: "One last time..." - }, client); - - const result = await Ethereum_Module.encodeParams({ - types: ["address", "uint256"], - values: ["0xB1B7586656116D546033e3bAFF69BFcD6592225E", "500"] - }, client); + await Logger_Module.log( + { + message: "Hello there", + level: Logger_Logger_LogLevelEnum.INFO, + }, + client + ); + + await Logger_Module.log( + { + message: "Hello again", + level: Logger_Logger_LogLevelEnum.INFO, + }, + client + ); + + await Logger_Module.log( + { + message: "One last time...", + level: Logger_Logger_LogLevelEnum.INFO, + }, + client + ); + + const result = await Ethereum_Module.encodeParams( + { + types: ["address", "uint256"], + values: ["0xB1B7586656116D546033e3bAFF69BFcD6592225E", "500"], + }, + client + ); if (result.ok) { console.log(`Ethereum_Module.encodeParams:\n${result.value}`); From 104e68686fe2fb04f5c0f10344769a97e1dae1f3 Mon Sep 17 00:00:00 2001 From: dOrgJelli Date: Wed, 12 Apr 2023 17:26:36 -0500 Subject: [PATCH 2/2] chore: use logging wrap --- .../templates/app/typescript/schema.graphql | 2 +- .../templates/app/typescript/src/index.ts | 41 +++++++------------ 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/packages/templates/app/typescript/schema.graphql b/packages/templates/app/typescript/schema.graphql index 95d5ea5cee..2b89a5497f 100644 --- a/packages/templates/app/typescript/schema.graphql +++ b/packages/templates/app/typescript/schema.graphql @@ -1,2 +1,2 @@ -#import * into Logger from "ens/wraps.eth:logger@1.0.0" +#import * into Logging from "ens/wraps.eth:logging@1.0.0" #import * into Ethereum from "ens/wraps.eth:ethereum@1.0.0" diff --git a/packages/templates/app/typescript/src/index.ts b/packages/templates/app/typescript/src/index.ts index 5ed2345ab7..f97a17cd1c 100644 --- a/packages/templates/app/typescript/src/index.ts +++ b/packages/templates/app/typescript/src/index.ts @@ -1,7 +1,6 @@ import { - Logger_Module, + Logging_Module, Ethereum_Module, - Logger_Logger_LogLevelEnum, } from "./wrap"; import { PolywrapClient } from "@polywrap/client-js"; @@ -9,31 +8,21 @@ import { PolywrapClient } from "@polywrap/client-js"; const client = new PolywrapClient(); async function main() { - console.log("Invoking: logMessage"); + console.log("Invoking: Logging.info(...)"); - await Logger_Module.log( - { - message: "Hello there", - level: Logger_Logger_LogLevelEnum.INFO, - }, - client - ); + await Logging_Module.info({ + message: "Hello there", + }, client); - await Logger_Module.log( - { - message: "Hello again", - level: Logger_Logger_LogLevelEnum.INFO, - }, - client - ); + await Logging_Module.info({ + message: "Hello again", + }, client); - await Logger_Module.log( - { - message: "One last time...", - level: Logger_Logger_LogLevelEnum.INFO, - }, - client - ); + await Logging_Module.info({ + message: "One last time...", + }, client); + + console.log("Invoking: Ethereum.encodeParams(...)"); const result = await Ethereum_Module.encodeParams( { @@ -44,9 +33,9 @@ async function main() { ); if (result.ok) { - console.log(`Ethereum_Module.encodeParams:\n${result.value}`); + console.log(`Ethereum.encodeParams:\n${result.value}`); } else { - console.log(`Error - Ethereum_Module.encodeParams:\n${result.error}`); + console.log(`Error - Ethereum.encodeParams:\n${result.error}`); } }