Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use correct version of unmarshalFromVstorage in bootstrap tests #99

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Use correct version of unmarshalFromVstorage in bootstrap tests #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea1919c
revert unmarshalFromVstorage fix
carlos-kryha Nov 17, 2023
b34c39d
Merge remote-tracking branch 'origin/develop' into hotfix/revert-unma…
carlos-kryha Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions agoric/contract/test/swingsetTests/bootstrap/bootstrap-upgradable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ import {
testFunctionalityAfterUpgrade,
testFunctionalityBeforeUpgrade,
} from './bootstrap-upgrade-v2.js';
import { unmarshalFromVstorage } from '@agoric/vats/tools/board-utils';
import { unmarshalFromVstorage } from '@agoric/internal/src/lib-chainStorage.js';
import { mint } from './bootstrap-null-upgrade.js';

const trace = makeTracer('kreadBootUpgrade');
Expand Down Expand Up @@ -167,9 +167,8 @@ export const buildRootObject = async () => {
* Reads the data from the vstorage at the given path
* Will throw an error if path doesnt exist
* @param {string} path
* @param {number} index index of the desired value in a deserialized stream cell (-1 for latest)
*/
const getFromVStorage = (path, index = -1) => {
const getFromVStorage = (path) => {
const { fromCapData } = makeMarshal(
undefined,
(slot, iface) => {
Expand All @@ -179,7 +178,7 @@ export const buildRootObject = async () => {
serializeBodyFormat: 'smallcaps',
},
);
return unmarshalFromVstorage(storageKit.data, path, fromCapData, index);
return unmarshalFromVstorage(storageKit.data, path, fromCapData);
};

const committeeName = 'KREAd Committee';
Expand Down
Loading