From cbfcc2a71812704f2ca25898c87ea29acf9f9d67 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ajones@digitalbazaar.com>
Date: Wed, 23 Nov 2022 15:12:52 -0500
Subject: [PATCH] Use br-mongobd 4 rc & change use of mongo results.

---
 lib/storage/ConfigStorage.js | 8 ++++----
 package.json                 | 4 ++--
 test/package.json            | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/storage/ConfigStorage.js b/lib/storage/ConfigStorage.js
index 6a979b5..9cf76a8 100644
--- a/lib/storage/ConfigStorage.js
+++ b/lib/storage/ConfigStorage.js
@@ -70,8 +70,8 @@ export class ConfigStorage {
     const record = {meta, config};
     try {
       const collection = this._getCollection();
-      const result = await collection.insertOne(record);
-      return result.ops[0];
+      await collection.insertOne(record);
+      return record;
     } catch(e) {
       if(!database.isDuplicateError(e)) {
         throw e;
@@ -157,8 +157,8 @@ export class ConfigStorage {
 
     const result = await collection.updateOne(
       query, {$set: {config, 'meta.updated': now}});
-
-    if(result.result.n === 0) {
+    const n = result.upsertedCount + result.modifiedCount;
+    if(n === 0) {
       // no records changed...
       throw new BedrockError(
         'Could not update configuration. ' +
diff --git a/package.json b/package.json
index 8e3bcb3..87191e4 100644
--- a/package.json
+++ b/package.json
@@ -48,12 +48,12 @@
     "@bedrock/express": "^8.0.0",
     "@bedrock/jsonld-document-loader": "^3.0.0",
     "@bedrock/meter-usage-reporter": "^8.0.0",
-    "@bedrock/mongodb": "^10.0.0",
+    "@bedrock/mongodb": "^11.0.0",
     "@bedrock/oauth2-verifier": "^1.0.0",
     "@bedrock/security-context": "^7.0.0",
     "@bedrock/validation": "^7.0.0",
     "@bedrock/veres-one-context": "^14.0.1",
-    "@bedrock/zcap-storage": "^8.0.0"
+    "@bedrock/zcap-storage": "^9.0.0"
   },
   "directories": {
     "lib": "./lib"
diff --git a/test/package.json b/test/package.json
index 9b37f73..9738bce 100644
--- a/test/package.json
+++ b/test/package.json
@@ -18,10 +18,10 @@
     "@bedrock/https-agent": "^4.0.0",
     "@bedrock/jsonld-document-loader": "^3.0.0",
     "@bedrock/ledger-context": "^23.0.0",
-    "@bedrock/meter": "^5.0.0",
+    "@bedrock/meter": "github:digitalbazaar/bedrock-meter#use-mongo-driver-4-rc",
     "@bedrock/meter-http": "^10.0.0",
     "@bedrock/meter-usage-reporter": "^8.0.0",
-    "@bedrock/mongodb": "^10.0.0",
+    "@bedrock/mongodb": "github:digitalbazaar/bedrock-mongodb#mongo-driver-4-rc",
     "@bedrock/oauth2-verifier": "^1.0.0",
     "@bedrock/security-context": "^7.0.0",
     "@bedrock/server": "^5.0.0",
@@ -29,7 +29,7 @@
     "@bedrock/test": "^8.0.5",
     "@bedrock/validation": "^7.0.0",
     "@bedrock/veres-one-context": "^14.0.1",
-    "@bedrock/zcap-storage": "^8.0.0",
+    "@bedrock/zcap-storage": "github:digitalbazaar/bedrock-zcap-storage#use-mongo-driver-4-rc",
     "@digitalbazaar/ed25519-signature-2020": "^4.0.1",
     "@digitalbazaar/ezcap": "^3.0.1",
     "@digitalbazaar/http-client": "^3.2.0",