diff --git a/packages/truffle-solidity-utils/.gitignore b/packages/solidity-utils/.gitignore similarity index 100% rename from packages/truffle-solidity-utils/.gitignore rename to packages/solidity-utils/.gitignore diff --git a/packages/truffle-solidity-utils/LICENSE b/packages/solidity-utils/LICENSE similarity index 100% rename from packages/truffle-solidity-utils/LICENSE rename to packages/solidity-utils/LICENSE diff --git a/packages/truffle-solidity-utils/README.md b/packages/solidity-utils/README.md similarity index 91% rename from packages/truffle-solidity-utils/README.md rename to packages/solidity-utils/README.md index 344d50c0752..c2d6d5f9e77 100644 --- a/packages/truffle-solidity-utils/README.md +++ b/packages/solidity-utils/README.md @@ -1,4 +1,4 @@ -# truffle-solidity-utils +# @truffle/solidity-utils Utilities for solidity contracts # API diff --git a/packages/truffle-solidity-utils/index.js b/packages/solidity-utils/index.js similarity index 85% rename from packages/truffle-solidity-utils/index.js rename to packages/solidity-utils/index.js index bf39af36595..bfe6fc86a7c 100644 --- a/packages/truffle-solidity-utils/index.js +++ b/packages/solidity-utils/index.js @@ -1,5 +1,4 @@ var SolidityUtils = { - getCharacterOffsetToLineAndColumnMapping: function(source) { var mapping = []; @@ -31,7 +30,7 @@ var SolidityUtils = { }, getHumanReadableSourceMap: function(sourceMap) { - var map = sourceMap.split(';'); + var map = sourceMap.split(";"); var last = {}; @@ -43,12 +42,12 @@ var SolidityUtils = { jump: last.jump }; - current = current.split(':'); + current = current.split(":"); - if (current[0] && current[0] !== '-1' && current[0].length) { + if (current[0] && current[0] !== "-1" && current[0].length) { ret.start = parseInt(current[0]); } - if (current[1] && current[1] !== '-1' && current[1].length) { + if (current[1] && current[1] !== "-1" && current[1].length) { ret.length = parseInt(current[1]); } if (current[2] /*&& current[2] !== '-1'*/ && current[2].length) { diff --git a/packages/truffle-solidity-utils/package.json b/packages/solidity-utils/package.json similarity index 66% rename from packages/truffle-solidity-utils/package.json rename to packages/solidity-utils/package.json index f41a7d2e95b..27a922689a6 100644 --- a/packages/truffle-solidity-utils/package.json +++ b/packages/solidity-utils/package.json @@ -1,10 +1,10 @@ { - "name": "truffle-solidity-utils", + "name": "@truffle/solidity-utils", "version": "1.2.3", "description": "Utilities for Solidity contracts", "main": "index.js", "scripts": {}, - "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/truffle-solidity-utils", + "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/solidity-utils", "keywords": [ "ethereum", "truffle", @@ -14,9 +14,9 @@ "author": "Tim Coulter ", "license": "MIT", "bugs": { - "url": "https://github.com/trufflesuite/truffle-solidity-utils/issues" + "url": "https://github.com/trufflesuite/truffle/issues" }, - "homepage": "https://github.com/trufflesuite/truffle-solidity-utils#readme", + "homepage": "https://github.com/trufflesuite/truffle/tree/master/packages/solidity-utils#readme", "publishConfig": { "access": "public" }, diff --git a/packages/truffle-compile/test/test_ordering.js b/packages/truffle-compile/test/test_ordering.js index eb1f0a501be..8b1c3afae68 100644 --- a/packages/truffle-compile/test/test_ordering.js +++ b/packages/truffle-compile/test/test_ordering.js @@ -136,7 +136,7 @@ describe("Compile - solidity ^0.4.0", function() { assert.deepEqual(abi, expectedOrder); }); - // Ported from `truffle-solidity-utils` + // Ported from `@truffle/solidity-utils` it("orders the ABI of a contract without functions", async function() { var sources = {}; // ComplexOrdered.sol includes contract `Empty` diff --git a/packages/truffle-core/package.json b/packages/truffle-core/package.json index 33e033979d9..b29f1a5eefc 100644 --- a/packages/truffle-core/package.json +++ b/packages/truffle-core/package.json @@ -61,7 +61,6 @@ "truffle-provisioner": "^0.1.5", "truffle-require": "^2.0.18", "truffle-resolver": "^5.0.15", - "truffle-solidity-utils": "^1.2.3", "truffle-workflow-compile": "^2.1.2", "universal-analytics": "^0.4.17", "web3": "1.2.1", diff --git a/packages/truffle-debugger/lib/solidity/selectors/index.js b/packages/truffle-debugger/lib/solidity/selectors/index.js index bbd98b1840f..9e56094e844 100644 --- a/packages/truffle-debugger/lib/solidity/selectors/index.js +++ b/packages/truffle-debugger/lib/solidity/selectors/index.js @@ -2,7 +2,7 @@ import debugModule from "debug"; const debug = debugModule("debugger:solidity:selectors"); import { createSelectorTree, createLeaf } from "reselect-tree"; -import SolidityUtils from "truffle-solidity-utils"; +import SolidityUtils from "@truffle/solidity-utils"; import CodeUtils from "truffle-code-utils"; import { findRange } from "lib/ast/map"; diff --git a/packages/truffle-debugger/package.json b/packages/truffle-debugger/package.json index aca1c1f46fa..14fc4c16314 100644 --- a/packages/truffle-debugger/package.json +++ b/packages/truffle-debugger/package.json @@ -33,7 +33,7 @@ "truffle-decode-utils": "^1.0.16", "truffle-decoder": "^3.0.9", "truffle-expect": "^0.0.9", - "truffle-solidity-utils": "^1.2.3", + "@truffle/solidity-utils": "^1.2.3", "web3": "1.2.1", "web3-eth-abi": "1.2.1" },