pull/1/head
LianaHus 6 years ago
parent 582f906f42
commit fa218bdca4
  1. 3
      src/app/tabs/runTab/model/settings.js
  2. 3
      src/app/tabs/runTab/settings.js
  3. 12
      test-browser/tests/generalTests.js

@ -1,6 +1,7 @@
var ethJSUtil = require('ethereumjs-util')
var Personal = require('web3-eth-personal')
var remixLib = require('remix-lib')
const addTooltip = require('../../../ui/tooltip')
var EventManager = remixLib.EventManager
var executionContext = remixLib.execution.executionContext
@ -97,7 +98,7 @@ class Settings {
const hashedMsg = executionContext.web3().sha3(message)
try {
executionContext.web3().eth.sign(account, hashedMsg, (error, signedData) => {
if (!error) alert("Please check your provider")
if (!error) addTooltip('Please check your provider to approve')
cb(error, hashedMsg, signedData)
})
} catch (e) {

@ -223,8 +223,9 @@ class SettingsUI {
var signMessageDialog = { 'title': 'Sign a message', 'text': 'Enter a message to sign', 'inputvalue': 'Message to sign' }
var $txOrigin = this.el.querySelector('#txorigin')
if (!$txOrigin.selectedOptions[0] && this.settings.isInjectedWeb3())
if (!$txOrigin.selectedOptions[0] && this.settings.isInjectedWeb3()) {
return addTooltip(`Account list is empty, please login to your wallet to load it`)
}
var account = $txOrigin.selectedOptions[0].value
var promptCb = (passphrase) => {

@ -163,21 +163,21 @@ function checkDeployShouldSucceed (browser, address, callback) {
function testSignature (browser, callback) {
let hash, signature
browser.clickLaunchIcon("run").pause(4000).perform((client, done)=>{
contractHelper.signMsg(browser, "test message", (h, s)=>{
browser.clickLaunchIcon('run').pause(4000).perform((client, done) => {
contractHelper.signMsg(browser, 'test message', (h, s) => {
hash = h
signature = s
contractHelper.addFile(browser, "signMassage.sol", sources[6]["browser/signMassage.sol"], ()=>{
contractHelper.addFile(browser, 'signMassage.sol', sources[6]['browser/signMassage.sol'], () => {
contractHelper.switchFile(browser, 'browser/signMassage.sol', () => {
contractHelper.selectContract(browser, 'ECVerify', () => { // deploy lib
contractHelper.createContract(browser, '', () => {
browser.waitForElementPresent('.instance:nth-of-type(4)')
.click('.instance:nth-of-type(4) > div > button')
.clickFunction("ecrecovery - call", {types: "bytes32 hash, bytes sig", values: `"${hash.value}","${signature.value}"`}).perform(
.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`}).perform(
() => {
contractHelper.verifyCallReturnValue(
contractHelper.verifyCallReturnalue(
browser,
"0x08970fed061e7747cd9a38d680a601510cb659fb",
'0x08970fed061e7747cd9a38d680a601510cb659fb',
['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'],
() => { callback(null, browser) }
)

Loading…
Cancel
Save