From 3f5954011f4a9828f759733a369be0b584175ef3 Mon Sep 17 00:00:00 2001
From: Matt Fellows <matt.fellows@onegeek.com.au>
Date: Sat, 18 Apr 2020 23:50:15 +1000
Subject: [PATCH] wip: tidy up debug messages

---
 examples/e2e/test/consumer.spec.js             |  8 +-------
 examples/e2e/test/publish.js                   | 18 ++----------------
 .../messages/provider/message-provider.spec.ts |  1 -
 scripts/build.sh                               |  3 ---
 src/dsl/options.ts                             |  4 ++--
 5 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/examples/e2e/test/consumer.spec.js b/examples/e2e/test/consumer.spec.js
index e3d4b0aaa..6e15d5f35 100644
--- a/examples/e2e/test/consumer.spec.js
+++ b/examples/e2e/test/consumer.spec.js
@@ -2,13 +2,7 @@ const path = require("path")
 const chai = require("chai")
 const chaiAsPromised = require("chai-as-promised")
 const expect = chai.expect
-const { Pact, Matchers, Publisher } = require("@pact-foundation/pact")
-const pact = require("@pact-foundation/pact")
-
-console.log("pact: ", pact)
-console.log("pact.Publisher: ", pact.Publisher)
-console.log("Publisher: ", Publisher)
-
+const { Pact, Matchers } = require("@pact-foundation/pact")
 const LOG_LEVEL = process.env.LOG_LEVEL || "WARN"
 
 chai.use(chaiAsPromised)
diff --git a/examples/e2e/test/publish.js b/examples/e2e/test/publish.js
index 7959ee6ac..3e93b7974 100644
--- a/examples/e2e/test/publish.js
+++ b/examples/e2e/test/publish.js
@@ -1,18 +1,4 @@
-console.log("Clearing existing require cache:")
-
-for (let key in require.cache) {
-  delete require.cache[key]
-}
-
-console.log("require.main:")
-console.log(require.main)
-console.log("require.resolve:")
-console.log(require.resolve("@pact-foundation/pact"))
-const pact = require("@pact-foundation/pact")
-
-console.log("pact: ", pact)
-console.log("publisher:", pact.Publisher)
-
+const { Publisher } = require("@pact-foundation/pact")
 const path = require("path")
 const opts = {
   pactFilesOrDirs: [
@@ -32,7 +18,7 @@ const opts = {
       : Math.floor(new Date() / 1000)),
 }
 
-new pact.Publisher(opts)
+new Publisher(opts)
   .publishPacts()
   .then(() => {
     console.log("Pact contract publishing complete!")
diff --git a/examples/messages/provider/message-provider.spec.ts b/examples/messages/provider/message-provider.spec.ts
index 37806d355..d8162f0f0 100644
--- a/examples/messages/provider/message-provider.spec.ts
+++ b/examples/messages/provider/message-provider.spec.ts
@@ -15,7 +15,6 @@ describe("Message provider tests", () => {
         return Promise.resolve(`state set to create a dog`)
       },
     },
-    log: path.resolve(process.cwd(), "logs"),
     logLevel: "info",
     provider: "MyJSMessageProvider",
     providerVersion: "1.0.0",
diff --git a/scripts/build.sh b/scripts/build.sh
index 6114e3bde..75e7eb38d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -16,9 +16,6 @@ ${DIR}/prepare.sh
 (cd dist && npm link)
 (cd dist-web && npm link)
 
-echo '\nconsole.log("HELLO FROM PACT MODULE");' >> dist/pact.js
-echo '\nconsole.log("HELLO FROM PACT WEB MODULE");' >> dist/pact-web.js
-
 echo "Running e2e examples build for node version ${TRAVIS_NODE_VERSION}"
 for i in examples/*; do
   [ -e "$i" ] || continue # prevent failure if there are no examples
diff --git a/src/dsl/options.ts b/src/dsl/options.ts
index b190dcd9a..d6a93d6ee 100644
--- a/src/dsl/options.ts
+++ b/src/dsl/options.ts
@@ -73,12 +73,12 @@ type ExcludedPactNodeVerifierKeys = Exclude<
   keyof PactNodeVerifierOptions,
   "providerBaseUrl"
 >
-export type PactNodeVerificationExcludedOptions = Pick<
+export type PactNodeVerificationIncludedOptions = Pick<
   PactNodeVerifierOptions,
   ExcludedPactNodeVerifierKeys
 >
 
-export type PactMessageProviderOptions = PactNodeVerificationExcludedOptions &
+export type PactMessageProviderOptions = PactNodeVerificationIncludedOptions &
   MessageProviderOptions
 
 export interface MessageConsumerOptions {