Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
Merge pull request #9 from rnsdomains/npm
Browse files Browse the repository at this point in the history
Npm
  • Loading branch information
ilanolkies authored Jan 2, 2020
2 parents f0cd1ce + ab95fb0 commit d5f2e98
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ jobs:
working_directory: ~/tpm

docker:
- image: circleci/node:latest
- image: circleci/node:10

steps:
- checkout
- run:
name: Prepare Truffle
command: sudo npm install -g truffle
command: sudo npm install -g truffle@5.1.0

- run:
name: Install rns-reverse
command: |
cd ~/tpm/
npm install
npm install
- run:
name: Run Truffle Tests
command: npm test
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sol linguist-language=Solidity
6 changes: 6 additions & 0 deletions contracts/Dummy.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pragma solidity ^0.5.0;

import "@rsksmart/rns-registry/contracts/RNS.sol";

contract Dummy {
}
2 changes: 1 addition & 1 deletion contracts/NameResolver.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity ^0.5.0;

import "./ResolverBase.sol";
import "@rsksmart/rns-artifacts/contracts/registry/AbstractRNS.sol";
import "@rsksmart/rns-registry/contracts/AbstractRNS.sol";

/// source: https://github.com/ensdomains/resolvers/blob/master/contracts/profiles/NameResolver.sol
contract NameResolver is ResolverBase {
Expand Down
2 changes: 1 addition & 1 deletion contracts/ReverseRegistrar.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.5.0;

import "@rsksmart/rns-artifacts/contracts/registry/AbstractRNS.sol";
import "@rsksmart/rns-registry/contracts/AbstractRNS.sol";
import "./NameResolver.sol";

contract ReverseRegistrar {
Expand Down
2 changes: 1 addition & 1 deletion contracts/ReverseSetup.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.5.0;

import "@rsksmart/rns-artifacts/contracts/registry/AbstractRNS.sol";
import "@rsksmart/rns-registry/contracts/AbstractRNS.sol";

contract ReverseSetup {
AbstractRNS rns;
Expand Down
4 changes: 1 addition & 3 deletions migrations/1_reverse_migration.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
var _contract = require('truffle-contract');
var rnsData = require('@rsksmart/rns-artifacts/build/contracts/RNS.json');
var RNS = _contract(rnsData);
const RNS = artifacts.require('RNS');

const NameResolver = artifacts.require('NameResolver');
const ReverseRegistrar = artifacts.require('ReverseRegistrar');
Expand Down
26 changes: 10 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,35 @@
{
"name": "rns-reverse",
"name": "@rsksmart/rns-reverse",
"version": "1.0.0",
"description": "RNS Reverse Resolution",
"main": "truffle-config.js",
"directories": {
"test": "test"
},
"description": "RNS Reverse",
"files": [
"/contracts",
"!/contracts/Migrations.sol"
],
"scripts": {
"test": "truffle test"
},
"repository": {
"type": "git",
"url": "git+https://github.com/rnsdomains/rns-reverse.git"
},
"keywords": [
"rns",
"rif",
"rsk"
],
"author": "ilanolkies",
"license": "ISC",
"bugs": {
"url": "https://github.com/rnsdomains/rns-reverse/issues"
},
"dependencies": {
"eth-ens-namehash": "^2.0.8"
"@rsksmart/rns-registry": "^1.0.0"
},
"devDependencies": {
"@rsksmart/rns-artifacts": "^1.0.0",
"@truffle/hdwallet-provider": "^1.0.18",
"chai": "^4.2.0",
"openzeppelin-test-helpers": "^0.4.3",
"truffle-contract": "^4.0.31"
"eth-ens-namehash": "^2.0.8",
"openzeppelin-test-helpers": "^0.4.3"
}
}
4 changes: 1 addition & 3 deletions test/reverse_registrar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
var _contract = require('truffle-contract');
var rnsData = require('@rsksmart/rns-artifacts/build/contracts/RNS.json');
var RNS = _contract(rnsData);
const RNS = artifacts.require('RNS');
const NameResolver = artifacts.require('NameResolver');
const ReverseRegistrar = artifacts.require('ReverseRegistrar');
const ReverseSetup = artifacts.require('ReverseSetup');
Expand Down
4 changes: 1 addition & 3 deletions test/reverse_setup.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
var _contract = require('truffle-contract');
var rnsData = require('@rsksmart/rns-artifacts/build/contracts/RNS.json');
var RNS = _contract(rnsData);
const RNS = artifacts.require('RNS');
const NameResolver = artifacts.require('NameResolver');
const ReverseRegistrar = artifacts.require('ReverseRegistrar');
const ReverseSetup = artifacts.require('ReverseSetup');
Expand Down

0 comments on commit d5f2e98

Please sign in to comment.