Merge pull request #2826 from trufflesuite/fix-assertions

Bug fix: Fix assertion library
trufflesuite · Feb 14, 2020 · c644f84 · c644f84
2 parents a2428a6 + 78835a4
commit c644f84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/core/lib/testing/soliditytest.js b/packages/core/lib/testing/soliditytest.js
@@ -19,8 +19,10 @@ const SolidityTest = {
 
     // Set up our runner's needs first.
     suite.beforeAll("prepare suite", async function() {
-      await runner.initialize.bind(runner)();
+      // This compiles some native contracts (including the assertion library
+      // contracts) which need to be compiled before initializing the runner
       await self.compileNewAbstractInterface.bind(this)(runner);
+      await runner.initialize.bind(runner)();
       await self.deployTestDependencies.bind(
         this
       )(abstraction, dependencyPaths, runner);

diff --git a/packages/core/lib/testing/testrunner.js b/packages/core/lib/testing/testrunner.js
@@ -175,7 +175,11 @@ TestRunner.prototype.endTest = async function(mocha) {
     fromBlock: this.currentTestStartBlock.toNumber()
   });
 
-  if (logs.length === 0) {
+  const userDefinedEventLogs = logs.filter(log => {
+    return log.decodings.every(decoding => decoding.abi.name !== "TestEvent")
+  });
+
+  if (userDefinedEventLogs.length === 0) {
     this.logger.log("    > No events were emitted");
     return;
   }
@@ -184,7 +188,7 @@ TestRunner.prototype.endTest = async function(mocha) {
   this.logger.log("    ---------------------------");
   this.logger.log("");
 
-  for (const log of logs) {
+  for (const log of userDefinedEventLogs) {
     switch (log.decodings.length) {
       case 0:
         this.logger.log(`    Warning: Could not decode event!`);