Skip to content

fixes for deactivating hardhat #1232

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

Merged
merged 3 commits into from
May 31, 2021
Merged

fixes for deactivating hardhat #1232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4532a3b
fixes for deactivating hardhat
May 28, 2021
577943e
check if hardhat is active before deactivating
Aniket-Engg May 31, 2021
8d02d6c
typpo
Aniket-Engg May 31, 2021
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
15 changes: 7 additions & 8 deletions apps/remix-ide/src/app/files/remixd-handle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ const profile = {
}

export class RemixdHandle extends WebsocketPlugin {
constructor (locahostProvider, appManager) {
constructor (localhostProvider, appManager) {
super(profile)
this.locahostProvider = locahostProvider
this.localhostProvider = localhostProvider
this.appManager = appManager
}

deactivate () {
if (super.socket) super.deactivate()
// this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
this.appManager.deactivatePlugin('hardhat')
this.locahostProvider.close((error) => {
if (this.appManager.actives.includes('hardhat')) this.appManager.deactivatePlugin('hardhat')
this.localhostProvider.close((error) => {
if (error) console.log(error)
})
}
Expand All @@ -53,7 +53,6 @@ export class RemixdHandle extends WebsocketPlugin {
async canceled () {
// await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
await this.appManager.deactivatePlugin('remixd')
await this.appManager.deactivatePlugin('hardhat')
}

/**
Expand Down Expand Up @@ -83,11 +82,11 @@ export class RemixdHandle extends WebsocketPlugin {
this.canceled()
}
}, 3000)
this.locahostProvider.init(() => {})
this.localhostProvider.init(() => {})
this.call('manager', 'activatePlugin', 'hardhat')
}
}
if (this.locahostProvider.isConnected()) {
if (this.localhostProvider.isConnected()) {
this.deactivate()
} else if (!isElectron()) {
// warn the user only if he/she is in the browser context
Expand All @@ -98,7 +97,7 @@ export class RemixdHandle extends WebsocketPlugin {
label: 'Connect',
fn: () => {
try {
this.locahostProvider.preInit()
this.localhostProvider.preInit()
super.activate()
setTimeout(() => {
if (!this.socket || (this.socket && this.socket.readyState === 3)) { // 3 means connection closed
Expand Down