Skip to content

Commit 0ea4920

Browse files
johnsmith-gooddollarjohnsmith-gooddollar
committed
Attempt to fix unit tests:
- updated snapshots - patched protocol package to fix node engine incompatibility issue - patched protocol package to use swc/core version compatible with ts-node and fix contracts build
1 parent 6f5beb0 commit 0ea4920

File tree

18 files changed

+5070
-1148
lines changed

18 files changed

+5070
-1148
lines changed

‎.github/workflows/webtests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
python-version: '3.7.x'
112112

113113
- name: Install dependencies
114-
run: yarn --immutable
114+
run: yarn
115115

116116
- uses: actions/cache@v2
117117
id: contractsCache

‎.yarn/patches/@gooddollar-goodprotocol-npm-2.0.13-b5c4924f17.patch‎

-6.84 KB
Binary file not shown.

‎.yarn/patches/@gooddollar-goodprotocol-npm-2.0.14-aefd0cca7d.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
diff --git a/package.json b/package.json
2+
index 32ffa522e902a8d16f89bdc9369265e35d9e07c6..4f8915032b119c4c6643752240ef8fc99c6cc01f 100644
3+
--- a/package.json
4+
+++ b/package.json
5+
@@ -3,7 +3,7 @@
6+
"version": "2.0.14",
7+
"description": "GoodDollar Protocol",
8+
"engines": {
9+
- "node": "18.x"
10+
+ "node": ">=16.x"
11+
},
12+
"main": "dist/test-sdk/index.js",
13+
"scripts": {
14+
@@ -93,7 +93,7 @@
15+
"@nomiclabs/hardhat-ethers": "^2.2.1",
16+
"@nomiclabs/hardhat-etherscan": "^3.1.0",
17+
"@nomiclabs/hardhat-waffle": "^2.0.3",
18+
- "@swc/core": "^1.2.196",
19+
+ "@swc/core": "1.3.82",
20+
"@swc/helpers": "^0.3.16",
21+
"@typechain/ethers-v5": "^8.0.2",
22+
"@types/mocha": "*",
23+
@@ -133,5 +133,11 @@
24+
"typechain": "^6.0.2",
25+
"typescript": "*"
26+
},
27+
- "packageManager": "yarn@3.6.0"
28+
+ "packageManager": "yarn@3.6.0",
29+
+ "resolutions": {
30+
+ "@swc/core": "1.3.82"
31+
+ },
32+
+ "overrides": {
33+
+ "@swc/core": "1.3.82"
34+
+ }
35+
}
36+
diff --git a/releases/deployment.json b/releases/deployment.json
37+
index 701c0acfba43087a044a4cf75eb91ff84a48ad5f..7412f5910a445d42f3eaae0858e6837fd9db4157 100644
38+
--- a/releases/deployment.json
39+
+++ b/releases/deployment.json
40+
@@ -212,6 +212,9 @@
41+
"BancorFormula": "0x57b2c85934Ef1A891eC9b9945f3fdbcf1104c302",
42+
"FeeFormula": "0x416B5A5e12235De6838D62Fd053e7Ce59E944426"
43+
},
44+
+ "development-mainnet": {
45+
+ "networkId": 1
46+
+ },
47+
"staging-mainnet": {
48+
"NameService": "0xC87FAb8A8CDD346079ca6177e47408Ba18066104",
49+
"GReputation": "0xD50604E530fF36B2747aE8574b37B21B9f779d37",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
"bignumber.js": "9.1.1",
369369
"lottie-react-native": "patch:lottie-react-native@npm:5.1.5#.yarn/patches/lottie-react-native-npm-5.1.5-384eb12f33.patch",
370370
"@usedapp/core": "patch:@usedapp/core@npm:1.2.6#.yarn/patches/@usedapp-core-npm-1.2.6-8dbe982e03.patch",
371-
"@gooddollar/goodprotocol": "patch:@gooddollar/goodprotocol@npm%3A2.0.13#./.yarn/patches/@gooddollar-goodprotocol-npm-2.0.13-b5c4924f17.patch"
371+
"@gooddollar/goodprotocol": "patch:@gooddollar/goodprotocol@npm%3A2.0.14#./.yarn/patches/@gooddollar-goodprotocol-npm-2.0.14-aefd0cca7d.patch"
372372
},
373373
"browserslist": [
374374
">0.2%",

‎src/components/appNavigation/__tests__/__snapshots__/AppNavigation.js.snap‎

Lines changed: 12 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ exports[`AppNavigation matches snapshot 1`] = `
1616
}
1717
>
1818
<div
19-
className="css-view-1dbjc4n r-backgroundColor-1jb27wt r-paddingBottom-97e31f r-paddingLeft-bv2aro r-paddingRight-hxflta r-paddingTop-10xqauy r-zIndex-417010"
19+
className="css-view-1dbjc4n r-backgroundColor-1jb27wt r-paddingBottom-97e31f r-paddingLeft-bv2aro r-paddingRight-hxflta r-paddingTop-10xqauy"
2020
style={
2121
Object {
2222
"boxShadow": "0px 3px 4px rgba(0,0,0,0.24)",
23+
"zIndex": 0,
2324
}
2425
}
2526
>
@@ -236,85 +237,14 @@ exports[`AppNavigation matches snapshot 1`] = `
236237
</div>
237238
</div>
238239
</div>
239-
<div
240-
className="css-view-1dbjc4n"
241-
>
242-
<div
243-
className="css-view-1dbjc4n r-boxShadow-oye7ye r-height-h3s6tt r-marginTop-19qrga8 r-position-bnwqim"
244-
>
245-
<div
246-
className="css-view-1dbjc4n r-cursor-1loqt21 r-touchAction-1otgn73 r-transitionProperty-1i6wzkk r-userSelect-lrvibr"
247-
onClick={[Function]}
248-
onContextMenu={[Function]}
249-
onKeyDown={[Function]}
250-
style={
251-
Object {
252-
"WebkitTransitionDuration": "0s",
253-
"transitionDuration": "0s",
254-
}
255-
}
256-
tabIndex="0"
257-
>
258-
<div
259-
className="css-view-1dbjc4n r-alignItems-1awozwy r-flex-13awgt0 r-height-1pi2tsx r-justifyContent-1777fci r-marginLeft-i5ea98 r-opacity-6dt33c r-position-u8s1d r-transform-1bd4ige r-width-13qz1uu"
260-
>
261-
<div
262-
className="css-view-1dbjc4n r-flexBasis-1mlwlqe r-overflow-1udh08x r-position-u8s1d r-right-zchlnj r-top-ipm5af r-zIndex-417010"
263-
style={
264-
Object {
265-
"backgroundColor": "rgba(0,0,0,1.00)",
266-
"borderBottomLeftRadius": "20px",
267-
"borderBottomRightRadius": "20px",
268-
"borderTopLeftRadius": "20px",
269-
"borderTopRightRadius": "20px",
270-
"height": "40px",
271-
"width": "40px",
272-
}
273-
}
274-
>
275-
<div
276-
className="css-view-1dbjc4n r-backgroundColor-1niwhzg r-backgroundPosition-vvn4in r-backgroundRepeat-u6sd8q r-backgroundSize-4gszlv r-bottom-1p0dtai r-height-1pi2tsx r-left-1d2f490 r-position-u8s1d r-right-zchlnj r-top-ipm5af r-width-13qz1uu r-zIndex-1wyyakw"
277-
style={
278-
Object {
279-
"backgroundImage": "url(\\"https://uploads-ssl.webflow.com/62d761bae8bf2da003f57b06/62d761bae8bf2dea68f57b52_walletchat%20logo.png\\")",
280-
}
281-
}
282-
suppressHydrationWarning={true}
283-
/>
284-
<img
285-
alt=""
286-
className="css-accessibilityImage-9pa8cd"
287-
draggable={false}
288-
src="https://uploads-ssl.webflow.com/62d761bae8bf2da003f57b06/62d761bae8bf2dea68f57b52_walletchat%20logo.png"
289-
/>
290-
</div>
291-
</div>
292-
<div
293-
className="css-view-1dbjc4n r-alignItems-1awozwy r-flex-13awgt0 r-height-1pi2tsx r-justifyContent-1777fci r-marginLeft-i5ea98 r-opacity-orgf3d r-position-u8s1d r-transform-1uie1fx r-width-13qz1uu"
294-
>
295-
<svg
296-
focusable="false"
297-
height="25"
298-
viewBox="0 0 16 14"
299-
width="28"
300-
xmlns="http://www.w3.org/2000/svg"
301-
>
302-
<path
303-
clipRule="evenodd"
304-
d="M.116 4.884l1.768-1.768L8 9.232l6.116-6.116 1.768 1.768L8 12.768.116 4.884z"
305-
fillRule="evenodd"
306-
/>
307-
</svg>
308-
</div>
309-
</div>
310-
</div>
311-
</div>
312240
</div>
313241
<div
314-
className="css-view-1dbjc4n r-alignItems-1awozwy r-justifyContent-1777fci r-marginTop-knv0ih r-opacity-6dt33c r-zIndex-1wyyakw"
242+
className="css-view-1dbjc4n r-alignItems-1awozwy r-justifyContent-1777fci r-marginTop-knv0ih"
315243
style={
316244
Object {
317245
"marginBottom": "8px",
246+
"opacity": 1,
247+
"zIndex": -1,
318248
}
319249
}
320250
>
@@ -484,40 +414,7 @@ exports[`AppNavigation matches snapshot 1`] = `
484414
"width": "40%",
485415
}
486416
}
487-
>
488-
<div
489-
className="css-view-1dbjc4n r-alignItems-1awozwy r-cursor-1loqt21 r-display-6koalj r-flexDirection-18u37iz r-touchAction-1otgn73 r-transitionProperty-1i6wzkk r-userSelect-lrvibr"
490-
onClick={[Function]}
491-
onContextMenu={[Function]}
492-
onKeyDown={[Function]}
493-
style={
494-
Object {
495-
"WebkitTransitionDuration": "0s",
496-
"transitionDuration": "0s",
497-
}
498-
}
499-
tabIndex="0"
500-
>
501-
<div
502-
className="css-view-1dbjc4n r-alignItems-1awozwy r-display-xoduu5 r-justifyContent-1777fci"
503-
style={Object {}}
504-
>
505-
<span
506-
className="css-text-901oao css-textHasAncestor-16my406 r-fontWeight-1it3c9n"
507-
style={
508-
Object {
509-
"color": "rgba(0,174,255,1.00)",
510-
"fontFamily": "gooddollar",
511-
"fontSize": "30px",
512-
"fontStyle": "normal",
513-
}
514-
}
515-
>
516-
517-
</span>
518-
</div>
519-
</div>
520-
</div>
417+
/>
521418
<div
522419
className="css-view-1dbjc4n r-alignItems-1awozwy r-backgroundColor-b7g440 r-borderRadius-1f0042m r-color-vaa0vc r-display-6koalj r-flexDirection-eqz5dr r-fontFamily-6jnb14 r-fontWeight-vw2c0b r-justifyContent-1777fci r-padding-t60dpp r-paddingHorizontal-1e081e0 r-paddingVertical-1yzf0co"
523420
style={
@@ -1501,7 +1398,12 @@ exports[`AppNavigation matches snapshot 1`] = `
15011398
className="css-view-1dbjc4n r-bottom-x89ehc r-height-1lh3azm r-position-u8s1d r-right-zchlnj r-width-1q42mak r-zIndex-1sg8ghl"
15021399
>
15031400
<div
1504-
className="css-view-1dbjc4n r-opacity-orgf3d"
1401+
className="css-view-1dbjc4n"
1402+
style={
1403+
Object {
1404+
"opacity": 0,
1405+
}
1406+
}
15051407
>
15061408
<div
15071409
className="css-view-1dbjc4n r-cursor-1loqt21 r-touchAction-1otgn73 r-transitionProperty-1i6wzkk r-userSelect-lrvibr"

0 commit comments

Comments
 (0)