From fc55ef5529ff6acaf68f014fc4c530ddd65ada18 Mon Sep 17 00:00:00 2001
From: Chris Hibbert <hibbert@agoric.com>
Date: Tue, 27 Aug 2024 11:55:45 -0700
Subject: [PATCH] chore: cleanup suggestions post-submission of 9970

---
 .../proposals/a:vaults-auctions/agd-tools.js   |  4 ++--
 .../proposals/a:vaults-auctions/eval.sh        |  5 +----
 .../proposals/a:vaults-auctions/prepare.sh     |  8 --------
 .../a:vaults-auctions/saveAuctionInstance.js   | 11 +++++------
 .../a:vaults-auctions/upgradeVaults.test.js    | 18 +++++++-----------
 5 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100755 a3p-integration/proposals/a:vaults-auctions/prepare.sh

diff --git a/a3p-integration/proposals/a:vaults-auctions/agd-tools.js b/a3p-integration/proposals/a:vaults-auctions/agd-tools.js
index 0655a3a2808..0dfc457f9cc 100644
--- a/a3p-integration/proposals/a:vaults-auctions/agd-tools.js
+++ b/a3p-integration/proposals/a:vaults-auctions/agd-tools.js
@@ -202,7 +202,7 @@ export const getProvisionPoolMetrics = async () => {
   return getQuoteBody(path);
 };
 
-export const getAuctionInstance = async price => {
+export const getInstanceBoardId = async instanceName => {
   const instanceRec = await queryVstorage(`published.agoricNames.instance`);
 
   const value = JSON.parse(instanceRec.value);
@@ -210,7 +210,7 @@ export const getAuctionInstance = async price => {
 
   const feeds = JSON.parse(body.body.substring(1));
 
-  const key = Object.keys(feeds).find(k => feeds[k][0] === 'auctioneer');
+  const key = Object.keys(feeds).find(k => feeds[k][0] === instanceName);
   if (key) {
     return body.slots[key];
   }
diff --git a/a3p-integration/proposals/a:vaults-auctions/eval.sh b/a3p-integration/proposals/a:vaults-auctions/eval.sh
index e9563fa7801..f835cb4ca15 100755
--- a/a3p-integration/proposals/a:vaults-auctions/eval.sh
+++ b/a3p-integration/proposals/a:vaults-auctions/eval.sh
@@ -1,7 +1,4 @@
-# we have an eval.sh so we can run prepare.sh before the rest
-
-echo "[$PROPOSAL] Running prepare.sh"
-./prepare.sh
+./saveAuctionInstance.js
 
 echo "[$PROPOSAL] Running proposal declared in package.json"
 # copy to run in the proposal package so the dependencies can be resolved
diff --git a/a3p-integration/proposals/a:vaults-auctions/prepare.sh b/a3p-integration/proposals/a:vaults-auctions/prepare.sh
deleted file mode 100755
index d1c774cc83d..00000000000
--- a/a3p-integration/proposals/a:vaults-auctions/prepare.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Place here any actions that should happen after the upgrade has executed. The
-# actions are executed in the upgraded chain software and the effects are
-# persisted in the generated image for the upgrade, so they can be used in
-# later steps, such as the "test" step, or further proposal layers.
-
-./saveAuctionInstance.js
diff --git a/a3p-integration/proposals/a:vaults-auctions/saveAuctionInstance.js b/a3p-integration/proposals/a:vaults-auctions/saveAuctionInstance.js
index 132c3c5a834..cbfbe11c7f9 100644
--- a/a3p-integration/proposals/a:vaults-auctions/saveAuctionInstance.js
+++ b/a3p-integration/proposals/a:vaults-auctions/saveAuctionInstance.js
@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 
 import { writeFile } from 'fs/promises';
-import { getAuctionInstance } from './agd-tools.js';
+import { getInstanceBoardId } from './agd-tools.js';
 
 const { env } = process;
 
-const oldAuctionInstance = await getAuctionInstance();
+const oldAuctionInstance = await getInstanceBoardId('auctioneer');
 console.log('old auction instance ', oldAuctionInstance, env.HOME);
 
-await writeFile(
-  `${env.HOME}/.agoric/previousInstance.json`,
-  oldAuctionInstance,
-);
+const filePath = `${env.HOME}/.agoric/tmp/auctionPreviousInstance.json`;
+
+await writeFile(filePath, oldAuctionInstance);
diff --git a/a3p-integration/proposals/a:vaults-auctions/upgradeVaults.test.js b/a3p-integration/proposals/a:vaults-auctions/upgradeVaults.test.js
index a262e4066fb..7274f5c6272 100644
--- a/a3p-integration/proposals/a:vaults-auctions/upgradeVaults.test.js
+++ b/a3p-integration/proposals/a:vaults-auctions/upgradeVaults.test.js
@@ -7,7 +7,7 @@ import {
   openVault,
   USER1ADDR,
 } from '@agoric/synthetic-chain';
-import { readFile } from 'fs/promises';
+import { readFile, unlink } from 'fs/promises';
 
 import {
   bankSend,
@@ -17,7 +17,7 @@ import {
   getVaultPrices,
   pushPrices,
   addPreexistingOracles,
-  getAuctionInstance,
+  getInstanceBoardId,
 } from './agd-tools.js';
 import { getDetailsMatchingVats } from './vatDetails.js';
 
@@ -108,19 +108,15 @@ const verifyVaultPriceUpdate = async t => {
 };
 
 const verifyAuctionInstance = async t => {
-  const newAuctionInstance = await getAuctionInstance();
-  const oldInstance = await readFile(
-    `${env.HOME}/.agoric/previousInstance.json`,
-    'utf-8',
-  );
+  const newAuctionInstance = await getInstanceBoardId('auctioneer');
+  const filePath = `${env.HOME}/.agoric/tmp/auctionPreviousInstance.json`;
+  const oldInstance = await readFile(filePath, 'utf-8');
 
   console.log(
     `new: ${newAuctionInstance} should be different from ${oldInstance}`,
   );
-  t.true(
-    newAuctionInstance !== oldInstance,
-    `new: ${newAuctionInstance} should be different from ${oldInstance}`,
-  );
+  t.not(newAuctionInstance, oldInstance);
+  await unlink();
 };
 
 // test.serial() isn't guaranteed to run tests in order, so we run the intended tests here