Commit 7bb99033 authored by yann300's avatar yann300

rename Fork => currentFork

parent f3281515
...@@ -295,7 +295,7 @@ class SettingsUI { ...@@ -295,7 +295,7 @@ class SettingsUI {
*/ */
_getProviderDropdownValue () { _getProviderDropdownValue () {
const provider = this.blockchain.getProvider() const provider = this.blockchain.getProvider()
const fork = this.blockchain.getFork() const fork = this.blockchain.getCurrentFork()
return provider === 'vm' ? provider + '-' + fork : provider return provider === 'vm' ? provider + '-' + fork : provider
} }
......
...@@ -212,6 +212,7 @@ class Blockchain { ...@@ -212,6 +212,7 @@ class Blockchain {
* return the fork name applied to the current envionment * return the fork name applied to the current envionment
* @return {String} - fork name * @return {String} - fork name
*/ */
getCurrentFork () {
return this.executionContext.getCurrentFork() return this.executionContext.getCurrentFork()
} }
......
...@@ -136,7 +136,7 @@ export class ExecutionContext { ...@@ -136,7 +136,7 @@ export class ExecutionContext {
return cb() return cb()
} }
this.currentFork = this.defaultFork this.currentFork = this.defaultFork // in the case of injected and web3, we default to the last fork.
if (context === 'injected') { if (context === 'injected') {
if (injectedProvider === undefined) { if (injectedProvider === undefined) {
......
...@@ -34,7 +34,7 @@ export class CodeManager { ...@@ -34,7 +34,7 @@ export class CodeManager {
}) })
}) })
}, },
fork: this.traceManager.getFork() fork: this.traceManager.getCurrentFork()
}) })
} }
......
...@@ -72,7 +72,7 @@ export class TraceManager { ...@@ -72,7 +72,7 @@ export class TraceManager {
this.traceCache.init() this.traceCache.init()
} }
getFork () { getCurrentFork () {
return this.fork return this.fork
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment